aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-05 10:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing two critical bugs in all apps transition controller

Browse Source 
am: 0a9c092c89

Change-Id: I115b7bc6d165dc9d5e73e1878b96d194bfc62da7
This commit is contained in:
Hyunyoung Song
2016-09-22 18:17:25 +00:00
committed by android-build-merger
parent abb607fc9b 0a9c092c89
commit ea045e7532
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/launcher3/allapps/AllAppsTransitionController.java
View File

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