From 7a33025b1f86ea5f8d74e4e0c7090393280344d3 Mon Sep 17 00:00:00 2001 From: Margaret Leibovic Date: Wed, 28 Aug 2013 17:42:32 -0700 Subject: [PATCH] Bug 909979 - Fix off-by-one error when long clicking views in BrowserSearch list. r=sriram --- mobile/android/base/home/BrowserSearch.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/home/BrowserSearch.java b/mobile/android/base/home/BrowserSearch.java index e23c66036c2..744a48d8491 100644 --- a/mobile/android/base/home/BrowserSearch.java +++ b/mobile/android/base/home/BrowserSearch.java @@ -93,7 +93,7 @@ public class BrowserSearch extends HomeFragment private LinearLayout mView; // The list showing search results - private ListView mList; + private HomeListView mList; // Client that performs search suggestion queries private volatile SuggestClient mSuggestClient; @@ -205,7 +205,7 @@ public class BrowserSearch extends HomeFragment // All list views are styled to look the same with a global activity theme. // If the style of the list changes, inflate it from an XML. mView = (LinearLayout) inflater.inflate(R.layout.browser_search, container, false); - mList = (ListView) mView.findViewById(R.id.home_list_view); + mList = (HomeListView) mView.findViewById(R.id.home_list_view); return mView; } @@ -239,6 +239,16 @@ public class BrowserSearch extends HomeFragment } }); + mList.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { + @Override + public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { + // Account for the search engines + position -= getSuggestEngineCount(); + + return mList.onItemLongClick(parent, view, position, id); + } + }); + final ListSelectionListener listener = new ListSelectionListener(); mList.setOnItemSelectedListener(listener); mList.setOnFocusChangeListener(listener);