aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard all apps pull up work behind the flag

Browse Source 
b/28917826

Change-Id: Ic001d820bad777d90c6bdcd1a17b6961e38769be
This commit is contained in:
Hyunyoung Song
2016-06-06 21:04:36 -07:00
parent 645764e3e5
commit b11ae50fcb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,7 +683,9 @@ public class LauncherStateTransitionAnimation {
animated, initialized, animation, revealDuration, layerViews);
}
if (!animated || !initialized) {
mAllAppsController.finishPullDown();
if (!FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) {
mAllAppsController.finishPullDown();
}
fromView.setVisibility(View.GONE);
dispatchOnLauncherTransitionPrepare(fromView, animated, multiplePagesVisible);
dispatchOnLauncherTransitionStart(fromView, animated, true);

2
src/com/android/launcher3/dragndrop/DragLayer.java
View File

@@ -274,7 +274,7 @@ public class DragLayer extends InsettableFrameLayout {
mActiveController = mDragController;
return true;
}
if (mAllAppsController.onInterceptTouchEvent(ev)) {
if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && mAllAppsController.onInterceptTouchEvent(ev)) {
mActiveController = mAllAppsController;
return true;
}