Merge "Volume: Extend the volume dialog timeout for notifications." (dfd6b4e9) · Commits · e / os / android_frameworks_base

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

+15 −2

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ public class VolumePanel extends Handler {
		private static final int FREE_DELAY = 10000;
		private static final int TIMEOUT_DELAY = 3000;
		private static final int TIMEOUT_DELAY_SHORT = 1500;
		private static final int TIMEOUT_DELAY_COLLAPSED = 4500;
		private static final int TIMEOUT_DELAY_EXPANDED = 10000;

		private static final int MSG_VOLUME_CHANGED = 0;
		@@ -591,11 +592,18 @@ public class VolumePanel extends Handler {

		private void updateTimeoutDelay() {
		mTimeoutDelay = mActiveStreamType == AudioManager.STREAM_MUSIC ? TIMEOUT_DELAY_SHORT
		: mZenPanelExpanded ? TIMEOUT_DELAY_EXPANDED : TIMEOUT_DELAY;
		: mZenPanelExpanded ? TIMEOUT_DELAY_EXPANDED
		: isZenPanelVisible() ? TIMEOUT_DELAY_COLLAPSED
		: TIMEOUT_DELAY;
		}

		private boolean isZenPanelVisible() {
		return mZenPanel != null && mZenPanel.getVisibility() == View.VISIBLE;
		}

		private void setZenPanelVisible(boolean visible) {
		if (LOGD) Log.d(mTag, "setZenPanelVisible " + visible + " mZenPanel=" + mZenPanel);
		final boolean changing = visible != isZenPanelVisible();
		if (visible) {
		if (mZenPanel == null) {
		mZenPanel = (ZenModePanel) mZenPanelStub.inflate();
		@@ -629,6 +637,10 @@ public class VolumePanel extends Handler {
		mZenPanel.setVisibility(View.GONE);
		}
		}
		if (changing) {
		updateTimeoutDelay();
		resetTimeout();
		}
		}

		public void updateStates() {
		@@ -1198,7 +1210,8 @@ public class VolumePanel extends Handler {
		}

		private void resetTimeout() {
		if (LOGD) Log.d(mTag, "resetTimeout at " + System.currentTimeMillis());
		if (LOGD) Log.d(mTag, "resetTimeout at " + System.currentTimeMillis()
		+ " delay=" + mTimeoutDelay);
		removeMessages(MSG_TIMEOUT);
		sendEmptyMessageDelayed(MSG_TIMEOUT, mTimeoutDelay);
		removeMessages(MSG_USER_ACTIVITY);