Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.

Use ACTION_CLOSE_SYSTEM_DIALOGS as an additional signal to immediately
dismiss the volume dialog, if showing.  Otherwise nav bar navigation
will not immediately dismiss the dialog.

Bug: 22173890
Change-Id: I3eee85a4579b4673b19402cf0f4048068009be35
This commit is contained in:
John Spurlock
2015-06-29 15:34:18 -04:00
parent bee7245c69
commit bc7233a8a3

View File

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