From 23972338ac3005a110eed1b12ada0cb3908e49b7 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 11 Apr 2018 16:44:23 -0700
Subject: [PATCH] Rename LandscapeStatesTouchController ->
 OverviewToAllAppsTouchController

I find this less confusing, as the controller is also used in portrait
mode when swipe down is disabled.

Change-Id: Ifd6b4453a1b59e1f8305c1461d89ed99de2fe7d6
---
 ...roller.java => OverviewToAllAppsTouchController.java} | 9 ++++++---
 .../src/com/android/launcher3/uioverrides/UiFactory.java | 5 ++---
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename quickstep/src/com/android/launcher3/uioverrides/{LandscapeStatesTouchController.java => OverviewToAllAppsTouchController.java} (89%)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java
similarity index 89%
rename from quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java
rename to quickstep/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java
index 30ceb43f93..e7816be3a3 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java
@@ -28,11 +28,13 @@ import com.android.quickstep.TouchInteractionService;
 import com.android.quickstep.views.RecentsView;
 
 /**
- * Touch controller from going from OVERVIEW to ALL_APPS
+ * Touch controller from going from OVERVIEW to ALL_APPS.
+ *
+ * This is used in landscape mode. It is also used in portrait mode for the fallback recents.
  */
-public class LandscapeStatesTouchController extends PortraitStatesTouchController {
+public class OverviewToAllAppsTouchController extends PortraitStatesTouchController {
 
-    public LandscapeStatesTouchController(Launcher l) {
+    public OverviewToAllAppsTouchController(Launcher l) {
         super(l);
     }
 
@@ -69,4 +71,5 @@ public class LandscapeStatesTouchController extends PortraitStatesTouchControlle
         }
         return fromState;
     }
+
 }
diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
index a10583cf86..2744bbc99b 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
@@ -21,7 +21,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW;
 import static com.android.launcher3.LauncherState.ALL_APPS;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 
 import com.android.launcher3.AbstractFloatingView;
 import com.android.launcher3.DeviceProfile;
@@ -42,13 +41,13 @@ public class UiFactory {
         if (!swipeUpEnabled) {
             return new TouchController[] {
                     launcher.getDragController(),
-                    new LandscapeStatesTouchController(launcher),
+                    new OverviewToAllAppsTouchController(launcher),
                     new LauncherTaskViewcontroller(launcher)};
         }
         if (launcher.getDeviceProfile().isVerticalBarLayout()) {
             return new TouchController[] {
                     launcher.getDragController(),
-                    new LandscapeStatesTouchController(launcher),
+                    new OverviewToAllAppsTouchController(launcher),
                     new LandscapeEdgeSwipeController(launcher),
                     new LauncherTaskViewcontroller(launcher)};
         } else {