Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 83cf383b: Close the global actions menu when the screen goes off.

Browse Source 
Merge commit '83cf383bf462ecb53b4233fc3ae7f1202938d80b'

* commit '83cf383bf462ecb53b4233fc3ae7f1202938d80b':
  Close the global actions menu when the screen goes off.
This commit is contained in:
Joe Onorato
2009-07-17 15:43:01 -07:00
committed by Android Git Automerger
parent 36c7b19264 78866b1e07
commit b41c0dc334
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
policy/com/android/internal/policy/impl/GlobalActions.java
View File

@@ -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);
}
}

1
policy/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -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;
}

7
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -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);
}