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

Commit b56fb5b7 authored by Adrian Roos's avatar Adrian Roos
Browse files

resolve merge conflicts of 5937d9ec to master 

Change-Id: I777ddff515bddd24cbc82c43f7c2c952847cb894
parents bc1eb107 5937d9ec

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

+2 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        if (scrim instanceof ScrimView) {

            float alpha2 = getDozeAlpha(scrim);

            float alpha = 1 - (1 - alpha1) * (1 - alpha2);

            alpha = Math.max(0, Math.min(1.0f, alpha));

            int baseColor = ((ScrimView) scrim).getScrimColor();

            ((ScrimView) scrim).setScrimColor(

                    ColorUtils.setAlphaComponent(baseColor, (int) (alpha * 255)));
@@ -462,6 +463,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
                    PropertyValuesHolder[] values = previousAnimator.getValues();

                    float relativeDiff = alpha - previousEndValue;

                    float newStartValue = previousStartValue + relativeDiff;

                    newStartValue = Math.max(0, Math.min(1.0f, newStartValue));

                    values[0].setFloatValues(newStartValue, alpha);

                    scrim.setTag(TAG_START_ALPHA, newStartValue);

                    scrim.setTag(TAG_END_ALPHA, alpha);