Merge "More dimming tweaks (for accessibility)" into oc-mr1-dev (6f69e559) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -80,7 +80,8 @@ public final class NavigationBarTransitions extends BarTransitions {

		@Override
		protected boolean isLightsOut(int mode) {
		return super.isLightsOut(mode) \|\| (mAutoDim && !mWallpaperVisible);
		return super.isLightsOut(mode) \|\| (mAutoDim && !mWallpaperVisible
		&& mode != MODE_WARNING);
		}

		public LightBarTransitionsController getLightTransitionsController() {
		@@ -108,7 +109,9 @@ public final class NavigationBarTransitions extends BarTransitions {
		// ok, everyone, stop it right there
		navButtons.animate().cancel();

		final float navButtonsAlpha = lightsOut ? 0.6f : 1f;
		// Bump percentage by 10% if dark.
		float darkBump = mLightTransitionsController.getCurrentDarkIntensity() / 10;
		final float navButtonsAlpha = lightsOut ? 0.6f + darkBump : 1f;

		if (!animate) {
		navButtons.setAlpha(navButtonsAlpha);
		@@ -130,6 +133,9 @@ public final class NavigationBarTransitions extends BarTransitions {
		for (int i = buttonDispatchers.size() - 1; i >= 0; i--) {
		buttonDispatchers.valueAt(i).setDarkIntensity(darkIntensity);
		}
		if (mAutoDim) {
		applyLightsOut(false, true);
		}
		}

		private final View.OnTouchListener mLightsOutListener = new View.OnTouchListener() {