merge from donut

policy/com/android/internal/policy/impl/GlobalActions.java

@@ -80,6 +80,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
         // receive broadcasts
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        filter.addAction(Intent.ACTION_SCREEN_OFF);
         context.registerReceiver(mBroadcastReceiver, filter);
 
         // get notified of phone state changes
@@ -483,9 +484,10 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
     private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
+            if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)
+                    || Intent.ACTION_SCREEN_OFF.equals(action)) {
                 String reason = intent.getStringExtra(PhoneWindowManager.SYSTEM_DIALOG_REASON_KEY);
-                if (! PhoneWindowManager.SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS.equals(reason)) {
+                if (!PhoneWindowManager.SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS.equals(reason)) {
                     mHandler.sendEmptyMessage(MESSAGE_DISMISS);
                 }
             }

policy/com/android/internal/policy/impl/KeyguardViewMediator.java

@@ -857,7 +857,6 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
             // manager not to honor request for userActivity.
             mRealPowerManager.enableUserActivity(false);
 
-            mCallback.onKeyguardShow();
             mKeyguardViewManager.show();
             mShowing = true;
         }

policy/com/android/internal/policy/impl/PhoneWindow.java

@@ -2510,6 +2510,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
         if (cb == null) {
             return false;
         } else {
+            sendCloseSystemWindows("search");
             return cb.onSearchRequested();
         }
     }

policy/com/android/internal/policy/impl/PhoneWindowManager.java

@@ -1690,13 +1690,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         return mKeyguardMediator.isInputRestricted();
     }
 
-    /**
-     * Callback from {@link KeyguardViewMediator}
-     */
-    public void onKeyguardShow() {
-        sendCloseSystemWindows();
-    }
-
     void sendCloseSystemWindows() {
         sendCloseSystemWindows(mContext, null);
     }