diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-09-22 18:17:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 18:17:25 +0000 |
| commit | ea045e7532edc8571456d3a4c61c89a0a2ab88ff (patch) | |
| tree | 2367aa11b2bfcbe139ac86f6fb14a40fca32be30 /src/com/android/launcher3/Launcher.java | |
| parent | abb607fc9b281fce764900940a49921bd5554885 (diff) | |
| parent | 0a9c092c89f4be3c5d59eef26aaffd2025e3e387 (diff) | |
| download | android_packages_apps_Trebuchet-ea045e7532edc8571456d3a4c61c89a0a2ab88ff.tar.gz android_packages_apps_Trebuchet-ea045e7532edc8571456d3a4c61c89a0a2ab88ff.tar.bz2 android_packages_apps_Trebuchet-ea045e7532edc8571456d3a4c61c89a0a2ab88ff.zip | |
Fixing two critical bugs in all apps transition controller
am: 0a9c092c89
Change-Id: I115b7bc6d165dc9d5e73e1878b96d194bfc62da7
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 123c7d8bf..b6474e6ef 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3101,7 +3101,6 @@ public class Launcher extends Activity mWorkspace.startReordering(v); } else { showOverviewMode(true); - mHotseat.requestDisallowInterceptTouchEvent(true); } } else { final boolean isAllAppsButton = @@ -3229,6 +3228,9 @@ public class Launcher extends Activity mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(), Workspace.State.OVERVIEW, animated, postAnimRunnable); mState = State.WORKSPACE; + // If animated from long press, then don't allow any of the controller in the drag + // layer to intercept any remaining touch. + mWorkspace.requestDisallowInterceptTouchEvent(animated); } /** |