summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2017-08-10 14:13:37 -0700
committerWinson Chung <winsonc@google.com>2017-08-10 14:28:06 -0700
commitd8a52f237ca17c9f33fa5840a9024e48c46f4a43 (patch)
tree8a1bc64d2ce5cf3438bb69f50051794b74567b5c /packages/SystemUI/src/com/android/systemui/SwipeHelper.java
parent57ae4db22508d3ee764650fec89effb5f3f461c8 (diff)
Fixing typo in swipe helper causing views not to be faded when swiped.
Bug: 63516235 Test: Enable flag to fade when swiped and verify it fades Change-Id: I49e7840d5423d018c1f88a02e8b272c80d0143a2
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/SwipeHelper.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/SwipeHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
index 6777ea2ef877..e3eaadd2c66c 100644
--- 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) {