From ee02c4258f67d4f6e4db58aac1a11dd5df9e9d05 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Tue, 26 Nov 2019 10:22:56 -0800
Subject: [PATCH] Fixed UserSwitchingDialog theme.

It didn't set windowAnimationStyle, and hence
ViewTreeObserver.OnWindowShownListener.onWindowShown() was never called.

Fixes: 145021634
Bug: 145211062
Test: manual verification switching users

Change-Id: I7f995dbe21922422f678f460d69fa37a3b4357d1
(cherry picked from commit 2a30fe59626060277398f93aaf754a12b873d7d0)
---
 core/res/res/values/themes_device_defaults.xml                | 1 +
 .../java/com/android/server/am/CarUserSwitchingDialog.java    | 4 +---
 .../core/java/com/android/server/am/UserSwitchingDialog.java  | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 628926231c65c..2b37a0c1af6b8 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -1733,6 +1733,7 @@ easier.
         <item name="colorBackground">@color/background_device_default_light</item>
         <item name="colorBackgroundFloating">@color/background_device_default_light</item>
         <item name="layout_gravity">center</item>
+        <item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item>
     </style>
 
     <style name="Theme.DeviceDefault.Notification" parent="@style/Theme.Material.Notification">
diff --git a/services/core/java/com/android/server/am/CarUserSwitchingDialog.java b/services/core/java/com/android/server/am/CarUserSwitchingDialog.java
index 183e05979c5e9..ebfc2a011e880 100644
--- a/services/core/java/com/android/server/am/CarUserSwitchingDialog.java
+++ b/services/core/java/com/android/server/am/CarUserSwitchingDialog.java
@@ -66,9 +66,7 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog {
         setCancelable(false);
         Resources res = getContext().getResources();
         // Custom view due to alignment and font size requirements
-        // TODO (b/145021634): disabled because it's delaying user switch by 3 seconds
-        // getContext()
-        // .setTheme(R.style.Theme_DeviceDefault_Light_Dialog_Alert_UserSwitchingDialog);
+        getContext().setTheme(R.style.Theme_DeviceDefault_Light_Dialog_Alert_UserSwitchingDialog);
         View view = LayoutInflater.from(getContext()).inflate(
                 R.layout.car_user_switching_dialog,
                 null);
diff --git a/services/core/java/com/android/server/am/UserSwitchingDialog.java b/services/core/java/com/android/server/am/UserSwitchingDialog.java
index f2c4cfe0de8f7..0ec4454cc4ea8 100644
--- a/services/core/java/com/android/server/am/UserSwitchingDialog.java
+++ b/services/core/java/com/android/server/am/UserSwitchingDialog.java
@@ -47,7 +47,8 @@ class UserSwitchingDialog extends AlertDialog
     // Time to wait for the onWindowShown() callback before continuing the user switch
     private static final int WINDOW_SHOWN_TIMEOUT_MS = 3000;
 
-    private static final boolean DEBUG = false;
+    // User switching doesn't happen that frequently, so it doesn't hurt to have it always on
+    protected static final boolean DEBUG = true;
 
     private final ActivityManagerService mService;
     private final int mUserId;