From 5771ca95aede3d1b8310a5035b46866a541c701c Mon Sep 17 00:00:00 2001
From: Edward Savage-Jones <edward.savage-jones@sony.com>
Date: Sat, 19 Oct 2019 11:36:11 +0200
Subject: [PATCH] [DO NOT MERGE] Get legacy recents working for secondary user

SystemUIWithLegacyRecents does not work correctly
for secondary user.

Bug: 143059739
Test: Manual
Change-Id: I0ca2d6a3c4e0ad2730bbd843733671ee221b1ec6
---
 packages/SystemUI/legacy/recents/res/values/config.xml    | 8 ++++++++
 .../com/android/systemui/recents/LegacyRecentsImpl.java   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/packages/SystemUI/legacy/recents/res/values/config.xml b/packages/SystemUI/legacy/recents/res/values/config.xml
index 2ff9abf4003d4..0fbb623d2ba01 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 a150de95fcf0f..a572110c6b9db 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);