diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-21 19:22:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-21 19:22:56 +0000 |
| commit | b55b6264aef177bc4de81e2c4c67bb225d6cbec9 (patch) | |
| tree | f8e8ab38483b38388c3016096a8256ded9e1ae20 /src/com/android/launcher3/Launcher.java | |
| parent | ee804af749116e5dcf5532252829876fd7a16259 (diff) | |
| parent | d725f644b70239332a4440173e6411e9ffb169a0 (diff) | |
| download | android_packages_apps_Trebuchet-b55b6264aef177bc4de81e2c4c67bb225d6cbec9.tar.gz android_packages_apps_Trebuchet-b55b6264aef177bc4de81e2c4c67bb225d6cbec9.tar.bz2 android_packages_apps_Trebuchet-b55b6264aef177bc4de81e2c4c67bb225d6cbec9.zip | |
Merge "Remove LAUNCHER3_ALL_APPS_PULL_UP Bug: 63712253 Verified: all apps transition fully functional Verified: NO_ALL_APPS_ICON = false case also works." into ub-launcher3-dorval-polish2
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index e229d6c65..6b2be3b81 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1310,9 +1310,7 @@ public class Launcher extends BaseActivity mDragController.addDropTarget(mWorkspace); mDropTargetBar.setup(mDragController); - if (FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP) { - mAllAppsController.setupViews(mAppsView, mHotseat, mWorkspace); - } + mAllAppsController.setupViews(mAppsView, mHotseat, mWorkspace); if (TestingUtils.MEMORY_DUMP_ENABLED) { TestingUtils.addWeightWatcher(this); @@ -2280,7 +2278,7 @@ public class Launcher extends BaseActivity if (v instanceof FolderIcon) { onClickFolderIcon(v); } - } else if ((FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && v instanceof PageIndicator) || + } else if ((v instanceof PageIndicator) || (v == mAllAppsButton && mAllAppsButton != null)) { onClickAllAppsButton(v); } else if (tag instanceof AppInfo) { |