am 4d6ac6ae: am c3409dd2: Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev

* commit '4d6ac6ae30a5437e0ce8605141151721348ff2a7':
  Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.
This commit is contained in:
John Spurlock
2015-06-29 20:29:27 +00:00
committed by Android Git Automerger

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