PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Guard all apps pull up work behind the flag" into ub-launcher3-calgary

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-07 04:18:24 +00:00
committed by Android (Google) Code Review
parent e9c5f8925f b11ae50fcb
commit 033f4ea716
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherStateTransitionAnimation.java
+3 -1
View File
@@ -683,7 +683,9 @@ public class LauncherStateTransitionAnimation {
animated, initialized, animation, revealDuration, layerViews); animated, initialized, animation, revealDuration, layerViews);
} }
if (!animated || !initialized) { if (!animated || !initialized) {
mAllAppsController.finishPullDown(); if (!FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) {
mAllAppsController.finishPullDown();
}
fromView.setVisibility(View.GONE); fromView.setVisibility(View.GONE);
dispatchOnLauncherTransitionPrepare(fromView, animated, multiplePagesVisible); dispatchOnLauncherTransitionPrepare(fromView, animated, multiplePagesVisible);
dispatchOnLauncherTransitionStart(fromView, animated, true); dispatchOnLauncherTransitionStart(fromView, animated, true);
src/com/android/launcher3/dragndrop/DragLayer.java
+1 -1
View File
@@ -274,7 +274,7 @@ public class DragLayer extends InsettableFrameLayout {
mActiveController = mDragController; mActiveController = mDragController;
return true; return true;
} }
if (mAllAppsController.onInterceptTouchEvent(ev)) { if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && mAllAppsController.onInterceptTouchEvent(ev)) {
mActiveController = mAllAppsController; mActiveController = mAllAppsController;
return true; return true;
} }