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

Commit f6e94145 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Only fade clock away at the top of the screen" into pi-dev am: 34a0b18a 

am: 4cfbfda1

Change-Id: I49416ffba63247ebef0bfb954438e8efc7c5c7fe
parents e94874ee 4cfbfda1

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

+1 −2
Original line number Diff line number Diff line
@@ -232,8 +232,7 @@ public class KeyguardClockPositionAlgorithm { 
        if (mCurrentlySecure) {

            alphaKeyguard = 1;

        } else {

            alphaKeyguard = Math.max(0, Math.min(1, (y - mMinTopMargin)

                    / Math.max(1f, getExpandedClockPosition() - mMinTopMargin)));

            alphaKeyguard = Math.max(0, y / Math.max(1f, getExpandedClockPosition()));

            alphaKeyguard = Interpolators.ACCELERATE.getInterpolation(alphaKeyguard);

        }

        return MathUtils.lerp(alphaKeyguard, 1f, mDarkAmount);