From 003ad48380fe90556da408fedba7dfc1a37790b9 Mon Sep 17 00:00:00 2001
From: Bjorn Bringert <bringert@android.com>
Date: Tue, 28 Jul 2009 12:03:29 +0100
Subject: [PATCH] Cancel search on BACK if IME is obscured.

This adds a hidden method AutoCompleteTextView.isImeHidden(),
and uses that in SearchDialog to cancel the search dialog
when BACK is pressed, if there is no previous search component
to return to.

mlebeau says:
 If we fill the whole screen then it makes the issue of the back
 button a little more important. Specifically, right now if you have
 the list expanded and you press back, the keyboard hides but it's not
 really showing any more anyway so it seems like pressing the button
 does nothing. We rationalized this by saying "part of the keyboard
 will be showing so it won't be completely non-obvious that it was
 hidden". But since really the right UX is to fill the screen, as part
 of this we should probably also add logic to the back button such
 that if it is pressed when the list is obscuring the keyboard
 (i.e. softInputMode on the PopupWindow is INPUT_METHOD_NOT_NEEDED)
 then we should hide the dialog entirely rather than closing the
 keyboard.

This is part of the fix for http://b/issue?id=2014450
---
 core/java/android/app/SearchDialog.java            |  6 ++++++
 core/java/android/widget/AutoCompleteTextView.java | 12 +++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index 34429fae876f8..dd24a75a9fd89 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -1709,6 +1709,12 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
                 if (mSearchDialog.backToPreviousComponent()) {
                     return true;
                 }
+                // If the drop-down obscures the keyboard, the user wouldn't see anything
+                // happening when pressing back, so we dismiss the entire dialog instead.
+                if (isInputMethodNotNeeded()) {
+                    mSearchDialog.cancel();
+                    return true;
+                }
                 return false; // will dismiss soft keyboard if necessary
             }
             return false;
diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index 6848a5555d574..a99807284b44c 100644
--- a/core/java/android/widget/AutoCompleteTextView.java
+++ b/core/java/android/widget/AutoCompleteTextView.java
@@ -209,8 +209,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
     private void onClickImpl() {
         // If the dropdown is showing, bring it back in front of the soft
         // keyboard when the user touches the text field.
-        if (mPopup.isShowing() &&
-                mPopup.getInputMethodMode() == PopupWindow.INPUT_METHOD_NOT_NEEDED) {
+        if (mPopup.isShowing() && isInputMethodNotNeeded()) {
             ensureImeVisible();
         }
     }
@@ -1102,6 +1101,13 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
         showDropDown();
     }
 
+    /**
+     * @hide internal used only here and SearchDialog
+     */
+    public boolean isInputMethodNotNeeded() {
+        return mPopup.getInputMethodMode() == PopupWindow.INPUT_METHOD_NOT_NEEDED;
+    }
+
     /**
      * <p>Displays the drop down on screen.</p>
      */
@@ -1111,7 +1117,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
         int widthSpec = 0;
         int heightSpec = 0;
 
-        boolean noInputMethod = mPopup.getInputMethodMode() == PopupWindow.INPUT_METHOD_NOT_NEEDED;
+        boolean noInputMethod = isInputMethodNotNeeded();
 
         if (mPopup.isShowing()) {
             if (mDropDownWidth == ViewGroup.LayoutParams.FILL_PARENT) {