diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-06-15 14:24:21 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-06-15 14:25:12 -0700 |
commit | 5606e070592521c80033381fc0536d4aa1351695 (patch) | |
tree | 20e2be508689b4be20c0b40a995e97e96683bf0a /src/com/android/launcher3/allapps | |
parent | 2de667d3af3328a3c3bd8cc32a45e7e543375fee (diff) | |
download | android_packages_apps_Trebuchet-5606e070592521c80033381fc0536d4aa1351695.tar.gz android_packages_apps_Trebuchet-5606e070592521c80033381fc0536d4aa1351695.tar.bz2 android_packages_apps_Trebuchet-5606e070592521c80033381fc0536d4aa1351695.zip |
Removing long press support from page-indicator
Bug: 62445549
Bug: 38163974
Change-Id: Ic0ae44ded7e4755c5401f327ce0d98a9ea96b2ab
Diffstat (limited to 'src/com/android/launcher3/allapps')
4 files changed, 2 insertions, 41 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index c3df07360..051c1612d 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -196,13 +196,6 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc } /** - * Focuses the search field and begins an app search. - */ - public void startAppsSearch() { - mSearchUiManager.startAppsSearch(); - } - - /** * Resets the state of AllApps. */ public void reset() { @@ -372,10 +365,6 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc targetParent.containerType = mAppsRecyclerView.getContainerType(v); } - public boolean shouldRestoreImeState() { - return mSearchUiManager.shouldRestoreImeState(); - } - @Override public void setInsets(Rect insets) { DeviceProfile grid = mLauncher.getDeviceProfile(); diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index d79b0d19d..2d8310bbe 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -227,9 +227,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul Action.Direction.UP, containerType); } - mLauncher.showAppsView(true /* animated */, - false /* updatePredictedApps */, - false /* focusSearchBar */); + mLauncher.showAppsView(true /* animated */, false /* updatePredictedApps */); if (hasSpringAnimationHandler()) { mSpringAnimationHandler.animateToFinalPosition(0); } @@ -250,9 +248,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul Action.Direction.UP, containerType); } - mLauncher.showAppsView(true, /* animated */ - false /* updatePredictedApps */, - false /* focusSearchBar */); + mLauncher.showAppsView(true, /* animated */ false /* updatePredictedApps */); } } } diff --git a/src/com/android/launcher3/allapps/SearchUiManager.java b/src/com/android/launcher3/allapps/SearchUiManager.java index 0d013c73f..c0d78508f 100644 --- a/src/com/android/launcher3/allapps/SearchUiManager.java +++ b/src/com/android/launcher3/allapps/SearchUiManager.java @@ -44,18 +44,6 @@ public interface SearchUiManager { */ void preDispatchKeyEvent(KeyEvent keyEvent); - /** - * Returns true if the IME should be brought back. - * TODO: Remove when removing support for opening all-apps in search mode. - */ - boolean shouldRestoreImeState(); - - /** - * Starts the search UI - * TODO: Remove when removing support for opening all-apps in search mode. - */ - void startAppsSearch(); - void addOnScrollRangeChangeListener(OnScrollRangeChangeListener listener); /** diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java index cb3b066fe..8e5452ee5 100644 --- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java +++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java @@ -153,18 +153,6 @@ public class AppsSearchContainerLayout extends FrameLayout } @Override - public boolean shouldRestoreImeState() { - return !TextUtils.isEmpty(mSearchInput.getText()); - } - - @Override - public void startAppsSearch() { - if (mApps != null) { - mSearchBarController.focusSearchField(); - } - } - - @Override public void onSearchResult(String query, ArrayList<ComponentKey> apps) { if (apps != null) { mApps.setOrderedFilter(apps); |