summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-09-22 18:17:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-22 18:17:25 +0000
commitea045e7532edc8571456d3a4c61c89a0a2ab88ff (patch)
tree2367aa11b2bfcbe139ac86f6fb14a40fca32be30 /src
parentabb607fc9b281fce764900940a49921bd5554885 (diff)
parent0a9c092c89f4be3c5d59eef26aaffd2025e3e387 (diff)
downloadandroid_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')
-rw-r--r--src/com/android/launcher3/Launcher.java4
-rw-r--r--src/com/android/launcher3/allapps/AllAppsTransitionController.java7
2 files changed, 6 insertions, 5 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);
}
/**
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 9fcc6a40e..1719b0594 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -109,7 +109,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
public boolean onInterceptTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
mNoIntercept = false;
- if (mLauncher.getWorkspace().isInOverviewMode() || mLauncher.isWidgetsViewVisible()) {
+ if (!mLauncher.isAllAppsVisible() && mLauncher.getWorkspace().workspaceInModalState()) {
mNoIntercept = true;
} else if (mLauncher.isAllAppsVisible() &&
!mAppsView.shouldContainerScroll(ev)) {
@@ -160,9 +160,8 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
return true;
}
} else {
- if ((mLauncher.getDragLayer().isEventOverHotseat(ev)
- || mLauncher.getDragLayer().isEventOverPageIndicator(ev))
- && !grid.isVerticalBarLayout()) {
+ if (mLauncher.getDragLayer().isEventOverHotseat(ev) ||
+ mLauncher.getDragLayer().isEventOverPageIndicator(ev)) {
return true;
}
}