openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fixing two critical bugs in all apps transition controller" into ub-launcher3-calgary

This commit is contained in:
Hyunyoung Song 2016-09-22 17:36:40 +00:00 committed by Android (Google) Code Review
parent d6925a9f70 0a9c092c89
commit b7d16b7e5c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/launcher3/Launcher.java
View File

@ -3235,7 +3235,6 @@ public class Launcher extends Activity
mWorkspace.startReordering(v); mWorkspace.startReordering(v);
} else { } else {
showOverviewMode(true); showOverviewMode(true);
mHotseat.requestDisallowInterceptTouchEvent(true);
} }
} else { } else {
final boolean isAllAppsButton = final boolean isAllAppsButton =
@ -3386,6 +3385,9 @@ public class Launcher extends Activity
mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(), mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
Workspace.State.OVERVIEW, animated, postAnimRunnable); Workspace.State.OVERVIEW, animated, postAnimRunnable);
mState = State.WORKSPACE; 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);
} }
/** /**

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

@ -108,7 +108,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
public boolean onInterceptTouchEvent(MotionEvent ev) { public boolean onInterceptTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { if (ev.getAction() == MotionEvent.ACTION_DOWN) {
mNoIntercept = false; mNoIntercept = false;
if (mLauncher.getWorkspace().isInOverviewMode() || mLauncher.isWidgetsViewVisible()) { if (!mLauncher.isAllAppsVisible() && mLauncher.getWorkspace().workspaceInModalState()) {
mNoIntercept = true; mNoIntercept = true;
} else if (mLauncher.isAllAppsVisible() && } else if (mLauncher.isAllAppsVisible() &&
!mAppsView.shouldContainerScroll(ev)) { !mAppsView.shouldContainerScroll(ev)) {
@ -159,9 +159,8 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
return true; return true;
} }
} else { } else {
if ((mLauncher.getDragLayer().isEventOverHotseat(ev) if (mLauncher.getDragLayer().isEventOverHotseat(ev) ||
|| mLauncher.getDragLayer().isEventOverPageIndicator(ev)) mLauncher.getDragLayer().isEventOverPageIndicator(ev)) {
&& !grid.isVerticalBarLayout()) {
return true; return true;
} }
} }