Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdec5ff9 authored by Jason Monk's avatar Jason Monk
Browse files

More dimming tweaks (for accessibility)

 - Don't dim when battery saver bar is showing.
 - Bump alpha by 10% for light nav bar

Test: manual
Change-Id: I296aa68c0904f7972dd941eb1aac3b4c71114eee
Fixes: 63630024
parent 97ff9f9d
Loading
Loading
Loading
Loading
+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() {