Merge "Volume: force-dismiss panel when the screen turns off." into lmp-dev (747a6996) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -371,7 +371,7 @@ public class VolumePanel extends Handler {
		final boolean masterVolumeKeySounds = res.getBoolean(R.bool.config_useVolumeKeySounds);
		mPlayMasterStreamTones = masterVolumeOnly && masterVolumeKeySounds;

		listenToRingerMode();
		registerReceiver();
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		@@ -441,9 +441,10 @@ public class VolumePanel extends Handler {
		updateStates();
		}

		private void listenToRingerMode() {
		private void registerReceiver() {
		final IntentFilter filter = new IntentFilter();
		filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
		filter.addAction(Intent.ACTION_SCREEN_OFF);
		mContext.registerReceiver(new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		@@ -453,6 +454,10 @@ public class VolumePanel extends Handler {
		removeMessages(MSG_RINGER_MODE_CHANGED);
		sendMessage(obtainMessage(MSG_RINGER_MODE_CHANGED));
		}

		if (Intent.ACTION_SCREEN_OFF.equals(action)) {
		postDismiss(0);
		}
		}
		}, filter);
		}