diff options
| author | Chet Haase <chet@google.com> | 2012-10-29 14:24:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-29 14:24:08 -0700 |
| commit | 36095e861b8aba1069cf1e28c89de8f3f299114a (patch) | |
| tree | 8fbf7aba2a4bef05792cde43fdc9b5f3b312a331 /src/com/android/launcher2/Launcher.java | |
| parent | e57e793bbdc6c51ba13481f82ff17a2f3e6910c5 (diff) | |
| parent | bc2f082dac475eff7fc0e40f90eb6c0552511170 (diff) | |
| download | android_packages_apps_Trebuchet-36095e861b8aba1069cf1e28c89de8f3f299114a.tar.gz android_packages_apps_Trebuchet-36095e861b8aba1069cf1e28c89de8f3f299114a.tar.bz2 android_packages_apps_Trebuchet-36095e861b8aba1069cf1e28c89de8f3f299114a.zip | |
Merge "Stop animating All Apps during transition to Home" into jb-mr1-dev
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 0225d28bf..c221815a4 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2697,6 +2697,7 @@ public final class Launcher extends Activity dispatchOnLauncherTransitionPrepare(fromView, animated, true); dispatchOnLauncherTransitionPrepare(toView, animated, true); + mAppsCustomizeContent.pauseScrolling(); mStateAnimation.addListener(new AnimatorListenerAdapter() { @Override @@ -2711,6 +2712,8 @@ public final class Launcher extends Activity if (onCompleteRunnable != null) { onCompleteRunnable.run(); } + mAppsCustomizeContent.updateCurrentPageScroll(); + mAppsCustomizeContent.resumeScrolling(); } }); |