Fixing two critical bugs in all apps transition controller

am: 0a9c092c89

Change-Id: I115b7bc6d165dc9d5e73e1878b96d194bfc62da7
This commit is contained in:
Hyunyoung Song authored and android-build-merger committed 2016-09-22 18:17:25 +00:00
commit ea045e7532
2 files changed
+6 -5

No files matched your search

@@ -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;
}
}