diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-18 15:48:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 19:20:15 +0000 |
| commit | 1f9cd414b2ff52878249ed0af3c42ee7b1ae72fb (patch) | |
| tree | 2a30a8707b3b266ffa571cb748c55ca401455765 /packages/SystemUI/src/com/android/systemui | |
| parent | 010150a1361d0a161cc40c8c1ca52a3ea30ac12e (diff) | |
| parent | c86f573fb8ef20097f92357c7763358f3a56ea20 (diff) | |
| download | frameworks_base-1f9cd414b2ff52878249ed0af3c42ee7b1ae72fb.zip frameworks_base-1f9cd414b2ff52878249ed0af3c42ee7b1ae72fb.tar.gz frameworks_base-1f9cd414b2ff52878249ed0af3c42ee7b1ae72fb.tar.bz2 | |
Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java index e38c2ac..6d6fd60 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java @@ -132,6 +132,9 @@ public class VolumeUI extends SystemUI { final Intent intent = ZenModePanel.ZEN_SETTINGS; intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); mContext.startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT)); + + // dismiss shade if showing + mContext.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); } }); mDialogPanel.postDismiss(mDismissDelay); |