Long press on the caret should start search on all apps container

Change-Id: I87e6b8a9b43bf8a84bcf4d39302bc5c6f6a5f3fd
2016-07-22 14:22:49 -07:00
parent 58368b1515
commit 68f98ac102
3 changed files with 6 additions and 2 deletions
@@ -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;
        }
@@ -52,6 +52,7 @@ public class PageIndicatorCaretLandscape extends PageIndicator {
        Launcher l = (Launcher) context;
        setOnTouchListener(l.getHapticFeedbackTouchListener());
        setOnClickListener(l);
+        setOnLongClickListener(l);
        setOnFocusChangeListener(l.mFocusHandler);
    }

@@ -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);