Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev

am: 35ebb3c535 Change-Id: I6c37b1732ac7941f5504b1c5d9ac8e13d8715606
2017-08-11 22:00:51 +00:00
parent d5593e0f19 35ebb3c535
commit e1cd325bca
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
@@ -203,7 +203,7 @@ public class SwipeHelper implements Gefingerpoken {
            return Math.max(1 - progress, 0);
        }

-        return Math.min(0, Math.max(1, progress / SWIPE_PROGRESS_FADE_END));
+        return 1f - Math.max(0, Math.min(1, progress / SWIPE_PROGRESS_FADE_END));
    }

    private void updateSwipeProgressFromOffset(View animView, boolean dismissable) {