Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "More dimming tweaks (for accessibility)" into oc-mr1-dev am: dbb448a3d7

Browse Source 
am: 6f69e55970

Change-Id: Ia93bb8ee554f23c9c4bd29e5178275314bdac327
This commit is contained in:
Jason Monk
2017-11-27 22:47:47 +00:00
committed by android-build-merger
parent a2faa31585 6f69e55970
commit 70164985f5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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() {