summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout/widget_search.xml1
-rw-r--r--src/com/android/launcher/Search.java8
2 files changed, 1 insertions, 8 deletions
diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml
index 7ecf5bf6d..a83e675ee 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 a0402a933..8a7c3529c 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()) {