commit 34a0b18a5c730e4fa16e27c63ed0cd79a6df188e
author Lucas Dupin <dupin@google.com> Tue Apr 17 00:14:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 17 00:14:22 2018 +0000
tree 4161eba753f63827799bbad1051a944fb820c0e4
parent d7732b4c8a4232d609bab257aec59865c9b6aa43
parent e9526a98362b78ba4ebfca105f74c3a1cd4ec95e

Merge "Only fade clock away at the top of the screen" into pi-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
index 1fb1ddd..d9a55c5 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java
@@ -232,8 +232,7 @@
         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);