commit 105925376f8d0f6b318c9938c7b83ef7fef094da
author The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:46 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Mar 18 17:39:46 2009 -0700
tree 3b19ee2bd8704cb9c6a0da7e42dec6759183de6d
parent ba87e3e6c985e7175152993b5efcc7dd2f0e1c93

auto import from //branches/cupcake_rel/...@140373

services/java/com/android/server/InputMethodManagerService.java

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 9948322..4198154 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -308,6 +308,9 @@
                 mScreenOn = true;
             } else if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
                 mScreenOn = false;
+            } else if (intent.getAction().equals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) {
+                hideInputMethodMenu();
+                return;
             } else {
                 Log.w(TAG, "Unexpected intent " + intent);
             }
@@ -436,6 +439,7 @@
         IntentFilter screenOnOffFilt = new IntentFilter();
         screenOnOffFilt.addAction(Intent.ACTION_SCREEN_ON);
         screenOnOffFilt.addAction(Intent.ACTION_SCREEN_OFF);
+        screenOnOffFilt.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
         mContext.registerReceiver(new ScreenOnOffReceiver(), screenOnOffFilt);
         
         buildInputMethodListLocked(mMethodList, mMethodMap);
@@ -585,6 +589,8 @@
                         + mCurClient.pid + " uid " + mCurClient.uid);
             }
             mCurClient = null;
+            
+            hideInputMethodMenuLocked();
         }
     }
     
@@ -820,6 +826,7 @@
             mCurToken = null;
         }
         
+        mCurId = null;
         clearCurMethodLocked();
         
         if (reportToClient && mCurClient != null) {
@@ -896,10 +903,12 @@
                 setInputMethodLocked(id);
             } catch (IllegalArgumentException e) {
                 Log.w(TAG, "Unknown input method from prefs: " + id, e);
+                mCurMethodId = null;
                 unbindCurrentMethodLocked(true);
             }
         } else {
             // There is no longer an input method set, so stop any current one.
+            mCurMethodId = null;
             unbindCurrentMethodLocked(true);
         }
     }
@@ -1436,18 +1445,22 @@
     }
     
     void hideInputMethodMenu() {
+        synchronized (mMethodMap) {
+            hideInputMethodMenuLocked();
+        }
+    }
+    
+    void hideInputMethodMenuLocked() {
         if (DEBUG) Log.v(TAG, "Hide switching menu");
 
-        synchronized (mMethodMap) {
-            if (mSwitchingDialog != null) {
-                mSwitchingDialog.dismiss();
-                mSwitchingDialog = null;
-            }
-            
-            mDialogBuilder = null;
-            mItems = null;
-            mIms = null;
+        if (mSwitchingDialog != null) {
+            mSwitchingDialog.dismiss();
+            mSwitchingDialog = null;
         }
+        
+        mDialogBuilder = null;
+        mItems = null;
+        mIms = null;
     }
     
     // ----------------------------------------------------------------------
@@ -1584,7 +1597,7 @@
             }
             p.println("  mInputMethodIcon=" + mInputMethodIcon);
             p.println("  mInputMethodData=" + mInputMethodData);
-            p.println("  mCurrentMethod=" + mCurMethodId);
+            p.println("  mCurMethodId=" + mCurMethodId);
             client = mCurClient;
             p.println("  mCurClient=" + client + " mCurSeq=" + mCurSeq);
             p.println("  mCurFocusedWindow=" + mCurFocusedWindow);