diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2017-08-17 22:26:35 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-08-21 11:59:14 -0700 |
| commit | d725f644b70239332a4440173e6411e9ffb169a0 (patch) | |
| tree | 73562baacc141bc177d3667e213428e895062f09 /src/com/android/launcher3/Launcher.java | |
| parent | eeccd38368fbfb5ea1b0540704df9e402a0388d1 (diff) | |
| download | android_packages_apps_Trebuchet-d725f644b70239332a4440173e6411e9ffb169a0.tar.gz android_packages_apps_Trebuchet-d725f644b70239332a4440173e6411e9ffb169a0.tar.bz2 android_packages_apps_Trebuchet-d725f644b70239332a4440173e6411e9ffb169a0.zip | |
Remove LAUNCHER3_ALL_APPS_PULL_UP
Bug: 63712253
Verified: all apps transition fully functional
Verified: NO_ALL_APPS_ICON = false case also works.
Change-Id: I779fb7bd4927c5923da3f85590d912dbbbcdef4d
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 615ec4716..106a11b73 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1307,9 +1307,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); @@ -2277,7 +2275,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) { |