From 31bbf9cbff8d5db6ab3b1cd93497045acdb8f74a Mon Sep 17 00:00:00 2001 From: Mike LeBeau Date: Tue, 28 Jul 2009 14:19:06 -0700 Subject: [PATCH] Stop trying to play tricks with the focusability of the search widget's TextView, as we weren't always doing it right, and it doesn't seem to help or hurt the frequency of the home screen sliding up when the widget is selected (that seems to be separate, see http://b/1819752). --- res/layout/widget_search.xml | 1 + src/com/android/launcher/Search.java | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml index 7ecf5bf6d5..a83e675ee7 100644 --- a/res/layout/widget_search.xml +++ b/res/layout/widget_search.xml @@ -40,6 +40,7 @@ android:layout_height="wrap_content" android:layout_weight="1.0" android:editable="false" + android:focusable="true" android:inputType="none" android:background="@drawable/textfield_searchwidget" android:textAppearance="?android:attr/textAppearanceMediumInverse" diff --git a/src/com/android/launcher/Search.java b/src/com/android/launcher/Search.java index a0402a9336..8a7c3529c9 100644 --- a/src/com/android/launcher/Search.java +++ b/src/com/android/launcher/Search.java @@ -194,10 +194,6 @@ public class Search extends LinearLayout // keyboard is not currently available. if (getContext().getResources().getConfiguration().hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_YES) { - // Make sure the text field is not focusable, so it's not responsible for - // causing the whole view to shift up to accommodate the keyboard. - mSearchText.setFocusable(false); - InputMethodManager inputManager = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE); inputManager.showSoftInputUnchecked(0, null); @@ -227,10 +223,6 @@ public class Search extends LinearLayout public void stopSearch(boolean animate) { setQuery(""); - // Set the search field back to focusable after making it unfocusable in - // startSearch, so that the home screen doesn't try to shift around when the - // keyboard comes up. - mSearchText.setFocusable(true); // Only restore if we are not already restored. if (getAnimation() == mMorphAnimation) { if (animate && !isAtTop()) {