summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-07-11 19:50:22 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-07-11 19:50:22 +0000
commitc8d84f6d5677d11c38d88b52224fbfeed058eb6f (patch)
tree58330096a09d7e2e79475717b6cb6896cba0e685
parent361d116bb905d4265b5dd0f895493a739b4cb372 (diff)
parenteb66898be068c8dc7521723d948dd400f4b8fc12 (diff)
downloadandroid_packages_apps_Trebuchet-c8d84f6d5677d11c38d88b52224fbfeed058eb6f.tar.gz
android_packages_apps_Trebuchet-c8d84f6d5677d11c38d88b52224fbfeed058eb6f.tar.bz2
android_packages_apps_Trebuchet-c8d84f6d5677d11c38d88b52224fbfeed058eb6f.zip
Merge cherrypicks of [8549820, 8549668, 8549613, 8549614, 8549935, 8549808, 8549876, 8549809, 8549552] into qt-release
Change-Id: I86207f3f19b13d8a3c99d77c594cd711e31b40a4
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
index 6ecf1c11b..a3c2e3cc8 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java
@@ -164,12 +164,6 @@ public abstract class RecentsUiFactory {
}
}
- if (FeatureFlags.PULL_DOWN_STATUS_BAR && Utilities.IS_DEBUG_DEVICE
- && !launcher.getDeviceProfile().isMultiWindowMode
- && !launcher.getDeviceProfile().isVerticalBarLayout()) {
- list.add(new StatusBarTouchController(launcher));
- }
-
list.add(new LauncherTaskViewController(launcher));
return list.toArray(new TouchController[list.size()]);
}