am 31bbf9cb: 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,

Merge commit '31bbf9cbff8d5db6ab3b1cd93497045acdb8f74a'

* commit '31bbf9cbff8d5db6ab3b1cd93497045acdb8f74a':
  Stop trying to play tricks with the focusability of the search widget's
This commit is contained in:
Mike LeBeau authored and Android Git Automerger committed 2009-07-28 15:34:31 -07:00
commit 77481e8e55
2 files changed
+1 -8

No files matched your search

+1
View File
@@ -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"
-8
View File
@@ -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()) {