diff options
author | Tony Wickham <twickham@google.com> | 2016-04-05 18:36:36 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-05-12 16:44:22 -0700 |
commit | f898b970cc9130d629d4bc969222aaa96a8a013a (patch) | |
tree | 1e349031ffe6102fd7cfe69adae5c8fb8bf186b0 /src/com/android/launcher3/PinchToOverviewListener.java | |
parent | 8f7ead3e94d0550beb85b83a8c1d5e78a9abd69f (diff) | |
download | android_packages_apps_Trebuchet-f898b970cc9130d629d4bc969222aaa96a8a013a.tar.gz android_packages_apps_Trebuchet-f898b970cc9130d629d4bc969222aaa96a8a013a.tar.bz2 android_packages_apps_Trebuchet-f898b970cc9130d629d4bc969222aaa96a8a013a.zip |
Call onLauncherTransitionPrepare() and End() from pinch.
This makes the pinch transition more consistent with other transitions.
One immediate benefit of this is that it updates adjacent overview
panels during pinch, regardless of whether they are completely visible.
Previously the adjacent panels' alphas weren't always reset to 0.
Specifically, if you made a small pinch from workspace, which
canceled and went back to workspace, adjacent pages retained a
slightly visible panel.
Bug: 27676309
Change-Id: I7e79fddec31cd649e0811e4524b9a9a501c627f9
Diffstat (limited to 'src/com/android/launcher3/PinchToOverviewListener.java')
-rw-r--r-- | src/com/android/launcher3/PinchToOverviewListener.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PinchToOverviewListener.java b/src/com/android/launcher3/PinchToOverviewListener.java index f32c8455e..0c8568e5e 100644 --- a/src/com/android/launcher3/PinchToOverviewListener.java +++ b/src/com/android/launcher3/PinchToOverviewListener.java @@ -108,6 +108,7 @@ public class PinchToOverviewListener extends ScaleGestureDetector.SimpleOnScaleG mInterpolator = mWorkspace.isInOverviewMode() ? new LogDecelerateInterpolator(100, 0) : new LogAccelerateInterpolator(100, 0); mPinchStarted = true; + mWorkspace.onLauncherTransitionPrepare(mLauncher, false, true); return true; } @@ -137,6 +138,7 @@ public class PinchToOverviewListener extends ScaleGestureDetector.SimpleOnScaleG mThresholdManager); } else { mThresholdManager.reset(); + mWorkspace.onLauncherTransitionEnd(mLauncher, false, true); } mPinchStarted = false; mPinchCanceled = false; @@ -206,6 +208,4 @@ public class PinchToOverviewListener extends ScaleGestureDetector.SimpleOnScaleG mPreviousTimeMillis = System.currentTimeMillis(); return false; } - - }
\ No newline at end of file |