summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-09-22 17:36:40 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-22 17:36:40 (GMT)
commitb7d16b7e5c1364f6b8bc0299f4a60a114a8a4718 (patch)
tree41d304b4418bfbc6733546eb81970a6fb7ca801f
parentd6925a9f70f1f5a5d5ed1910e27da8e08dbd5d3e (diff)
parent0a9c092c89f4be3c5d59eef26aaffd2025e3e387 (diff)
downloadandroid_packages_apps_Trebuchet-b7d16b7e5c1364f6b8bc0299f4a60a114a8a4718.zip
android_packages_apps_Trebuchet-b7d16b7e5c1364f6b8bc0299f4a60a114a8a4718.tar.gz
android_packages_apps_Trebuchet-b7d16b7e5c1364f6b8bc0299f4a60a114a8a4718.tar.bz2
Merge "Fixing two critical bugs in all apps transition controller" into ub-launcher3-calgary
-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 81c95e7..1caec33 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3235,7 +3235,6 @@ public class Launcher extends Activity
mWorkspace.startReordering(v);
} else {
showOverviewMode(true);
- mHotseat.requestDisallowInterceptTouchEvent(true);
}
} else {
final boolean isAllAppsButton =
@@ -3386,6 +3385,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 5888230..41d6393 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -108,7 +108,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)) {
@@ -159,9 +159,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;
}
}