diff options
| author | John Spurlock <jspurlock@google.com> | 2015-06-29 20:08:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 20:08:44 +0000 |
| commit | c3409dd25353000fd8ba644e04caeba4dc08ea5f (patch) | |
| tree | 0a9472a336639669571e9e0172bbbf414479010d /packages | |
| parent | a1b647c8833cf85e304e3c201e7d0477b9838502 (diff) | |
| parent | bc7233a8a37dd8090d6e04b8c92bc93c868e16b2 (diff) | |
| download | frameworks_base-c3409dd25353000fd8ba644e04caeba4dc08ea5f.zip frameworks_base-c3409dd25353000fd8ba644e04caeba4dc08ea5f.tar.gz frameworks_base-c3409dd25353000fd8ba644e04caeba4dc08ea5f.tar.bz2 | |
Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java index 9a59a2a..32d6805 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java @@ -768,6 +768,7 @@ public class VolumeDialogController { filter.addAction(NotificationManager.ACTION_EFFECTS_SUPPRESSOR_CHANGED); filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); filter.addAction(Intent.ACTION_SCREEN_OFF); + filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); mContext.registerReceiver(this, filter, null, mWorker); } @@ -822,6 +823,9 @@ public class VolumeDialogController { } else if (action.equals(Intent.ACTION_SCREEN_OFF)) { if (D.BUG) Log.d(TAG, "onReceive ACTION_SCREEN_OFF"); mCallbacks.onScreenOff(); + } else if (action.equals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) { + if (D.BUG) Log.d(TAG, "onReceive ACTION_CLOSE_SYSTEM_DIALOGS"); + dismiss(); } if (changed) { mCallbacks.onStateChanged(mState); |