diff options
| author | Tony Wickham <twickham@google.com> | 2018-06-19 22:04:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-19 22:04:17 +0000 |
| commit | c0b468c990731a936d0c3c1039c4cdd5c3d2c240 (patch) | |
| tree | 033c7020ceeb5777f590df62927dcb30cd48dee6 /src/com/android/launcher3 | |
| parent | 3c83d4ed72ee462b0530b5b7b71f86e409190676 (diff) | |
| parent | 89126653cd38b6b461e893edbd3163d27a943c83 (diff) | |
| download | android_packages_apps_Trebuchet-c0b468c990731a936d0c3c1039c4cdd5c3d2c240.tar.gz android_packages_apps_Trebuchet-c0b468c990731a936d0c3c1039c4cdd5c3d2c240.tar.bz2 android_packages_apps_Trebuchet-c0b468c990731a936d0c3c1039c4cdd5c3d2c240.zip | |
Merge "Don't intercept above shelf progress if still animating" into ub-launcher3-edmonton-polish
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/touch/AbstractStateChangeTouchController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index 955177aa7..0d2bcb2c5 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -86,7 +86,7 @@ public abstract class AbstractStateChangeTouchController private boolean mCanBlockFling; private FlingBlockCheck mFlingBlockCheck = new FlingBlockCheck(); - private AnimatorSet mAtomicAnim; + protected AnimatorSet mAtomicAnim; // True if we want to resume playing atomic components when mAtomicAnim completes. private boolean mScheduleResumeAtomicComponent; private AutoPlayAtomicAnimationInfo mAtomicAnimAutoPlayInfo; |