summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Edward Savage-Jones <edward.savage-jones@sony.com> 2019-10-31 14:39:26 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-31 14:39:26 -0700
commit67a8fa0ff7c3f5c24d39b45f53c8bbfe269c27d1 (patch)
treee422cdcac0dac92a68d0973b3a2facc98cee01bd
parentabc015499ab91d04583ddd42ca25a2e080c77665 (diff)
parent786e7f34fae7331a24367f598b289714f7a71fac (diff)
Merge "[DO NOT MERGE] Get legacy recents working for secondary user"
am: 786e7f34fa Change-Id: Ibcaaf674e1089f25be9f4236e5bbfbfddcb36d1c
-rw-r--r--packages/SystemUI/legacy/recents/res/values/config.xml8
-rw-r--r--packages/SystemUI/legacy/recents/src/com/android/systemui/recents/LegacyRecentsImpl.java1
2 files changed, 9 insertions, 0 deletions
diff --git a/packages/SystemUI/legacy/recents/res/values/config.xml b/packages/SystemUI/legacy/recents/res/values/config.xml
index 2ff9abf4003d..0fbb623d2ba0 100644
--- a/packages/SystemUI/legacy/recents/res/values/config.xml
+++ b/packages/SystemUI/legacy/recents/res/values/config.xml
@@ -26,6 +26,14 @@
(package/class) -->
<string name="config_recentsComponent" translatable="false">com.android.systemui.recents.LegacyRecentsImpl</string>
+ <!-- SystemUI Services (per user): The classes of the stuff to start for each user. This is a subset of the config_systemUIServiceComponents -->
+ <string-array name="config_systemUIServiceComponentsPerUser" translatable="false">
+ <item>com.android.systemui.Dependency$DependencyCreator</item>
+ <item>com.android.systemui.util.NotificationChannels</item>
+ <item>com.android.systemui.statusbar.CommandQueue$CommandQueueStart</item>
+ <item>com.android.systemui.recents.Recents</item>
+ </string-array>
+
<!-- Whether recents should use hardware layers for its taskviews. This flag can be enabled
for devices where the java drawing of round rects may be slow -->
<bool name="config_recents_use_hardware_layers">false</bool>
diff --git a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/LegacyRecentsImpl.java b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/LegacyRecentsImpl.java
index a150de95fcf0..a572110c6b9d 100644
--- a/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/LegacyRecentsImpl.java
+++ b/packages/SystemUI/legacy/recents/src/com/android/systemui/recents/LegacyRecentsImpl.java
@@ -195,6 +195,7 @@ public class LegacyRecentsImpl implements RecentsImplementation {
mContext.getColor(R.color.recents_task_bar_default_background_color);
final int defaultTaskViewBackgroundColor =
mContext.getColor(R.color.recents_task_view_default_background_color);
+ getComponent(Recents.class).putComponent(LegacyRecentsImpl.class, this);
sDebugFlags = new RecentsDebugFlags();
sSystemServicesProxy = SystemServicesProxy.getInstance(mContext);
sConfiguration = new RecentsConfiguration(mContext);