diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-07-22 21:39:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 21:39:43 +0000 |
commit | 2375b0b5746b85b0b055b17afe0a5fd8c367d782 (patch) | |
tree | e942df7cd431eb12f54c9433b4fe3cbf8c49a026 | |
parent | 22c2227d3de64f9f7e324d8e36966a8481586984 (diff) | |
parent | 68f98ac102a2719203883d87add6483797b516da (diff) | |
download | android_packages_apps_Trebuchet-2375b0b5746b85b0b055b17afe0a5fd8c367d782.tar.gz android_packages_apps_Trebuchet-2375b0b5746b85b0b055b17afe0a5fd8c367d782.tar.bz2 android_packages_apps_Trebuchet-2375b0b5746b85b0b055b17afe0a5fd8c367d782.zip |
Long press on the caret should start search on all apps container
am: 68f98ac102
Change-Id: I9481083e06e601dbd7d603b41093bf3ae4710453
3 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 43c7281b2..f8b7c7421 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2511,7 +2511,8 @@ public class Launcher extends Activity if (v instanceof FolderIcon) { onClickFolderIcon(v); } - } else if (v instanceof PageIndicator || (v == mAllAppsButton && mAllAppsButton != null)) { + } else if ((FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && v instanceof PageIndicator) || + (v == mAllAppsButton && mAllAppsButton != null)) { onClickAllAppsButton(v); } else if (tag instanceof AppInfo) { startAppShortcutOrInfoActivity(v); @@ -3157,7 +3158,8 @@ public class Launcher extends Activity if (isWorkspaceLocked()) return false; if (mState != State.WORKSPACE) return false; - if (v == mAllAppsButton && mAllAppsButton != null) { + if ((FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && v instanceof PageIndicator) || + (v == mAllAppsButton && mAllAppsButton != null)) { onLongClickAllAppsButton(v); return true; } diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorCaretLandscape.java b/src/com/android/launcher3/pageindicators/PageIndicatorCaretLandscape.java index 1eee59e0c..fea47a98f 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorCaretLandscape.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorCaretLandscape.java @@ -52,6 +52,7 @@ public class PageIndicatorCaretLandscape extends PageIndicator { Launcher l = (Launcher) context; setOnTouchListener(l.getHapticFeedbackTouchListener()); setOnClickListener(l); + setOnLongClickListener(l); setOnFocusChangeListener(l.mFocusHandler); } diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java b/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java index fbfb61ba5..0b947913e 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java @@ -136,6 +136,7 @@ public class PageIndicatorLineCaret extends PageIndicator { mLauncher = (Launcher) context; setOnTouchListener(mLauncher.getHapticFeedbackTouchListener()); setOnClickListener(mLauncher); + setOnLongClickListener(mLauncher); setOnFocusChangeListener(mLauncher.mFocusHandler); setCaretDrawable(new CaretDrawable(context)); mLineHeight = res.getDimensionPixelSize(R.dimen.dynamic_grid_page_indicator_line_height); |