From bf78f3cd41983c2c5bab5bbb4fa5cdcee4e3b14e Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 14 Jul 2017 15:58:48 -0700
Subject: [PATCH] Collapse caret click and all apps click into one

-> Was separating them for cleanliness, but turns out
   in portrait the caret is the button, but in landscape it's not.
   We'll clean all this up later.

Change-Id: Icbc185f9183ded685b4a988eacf19cb7583ed8ad
---
 src/com/android/launcher3/Launcher.java | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 6ab50f69ff..fe459bb0d7 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2256,9 +2256,8 @@ public class Launcher extends BaseActivity
             if (v instanceof FolderIcon) {
                 onClickFolderIcon(v);
             }
-        } else if ((FeatureFlags.LAUNCHER3_ALL_APPS_PULL_UP && v instanceof PageIndicator)) {
-            onClickAllAppsCaret(v);
-        } else if (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);
@@ -2309,27 +2308,14 @@ public class Launcher extends BaseActivity
     }
 
     /**
-     * Event handler for the "grid" button that appears on the home screen, which
-     * enters all apps mode.
+     * Event handler for the "grid" button or "caret" that appears on the home screen, which
+     * enters all apps mode. In verticalBarLayout the caret can be seen when all apps is open, and
+     * so in that case reverses the action.
      *
      * @param v The view that was clicked.
      */
     protected void onClickAllAppsButton(View v) {
         if (LOGD) Log.d(TAG, "onClickAllAppsButton");
-        if (!isAppsViewVisible()) {
-            getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
-                    ControlType.ALL_APPS_BUTTON);
-            showAppsView(true /* animated */, true /* updatePredictedApps */);
-        }
-    }
-
-    /**
-     * Event handler for the swipe up caret
-     *
-     * @param v The view that was clicked.
-     */
-    protected void onClickAllAppsCaret(View v) {
-        if (LOGD) Log.d(TAG, "onClickAllAppsCaret");
         if (!isAppsViewVisible()) {
             getUserEventDispatcher().logActionOnControl(Action.Touch.TAP,
                     ControlType.ALL_APPS_BUTTON);