Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed UserSwitchingDialog theme." into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-07 06:32:52 +00:00
committed by Android (Google) Code Review
parent 839c5ec5e4 ee02c4258f
commit 948ed682ff
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/values/themes_device_defaults.xml
View File

@@ -1733,6 +1733,7 @@ easier.
<item name="colorBackground">@color/background_device_default_light</item> <item name="colorBackground">@color/background_device_default_light</item>
<item name="colorBackgroundFloating">@color/background_device_default_light</item> <item name="colorBackgroundFloating">@color/background_device_default_light</item>
<item name="layout_gravity">center</item> <item name="layout_gravity">center</item>
<item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item>
</style> </style>
<style name="Theme.DeviceDefault.Notification" parent="@style/Theme.Material.Notification"> <style name="Theme.DeviceDefault.Notification" parent="@style/Theme.Material.Notification">

4
services/core/java/com/android/server/am/CarUserSwitchingDialog.java
View File

@@ -66,9 +66,7 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog {
setCancelable(false); setCancelable(false);
Resources res = getContext().getResources(); Resources res = getContext().getResources();
// Custom view due to alignment and font size requirements // 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( View view = LayoutInflater.from(getContext()).inflate(
R.layout.car_user_switching_dialog, R.layout.car_user_switching_dialog,
null); null);

3
services/core/java/com/android/server/am/UserSwitchingDialog.java
View File

@@ -47,7 +47,8 @@ class UserSwitchingDialog extends AlertDialog
// Time to wait for the onWindowShown() callback before continuing the user switch // Time to wait for the onWindowShown() callback before continuing the user switch
private static final int WINDOW_SHOWN_TIMEOUT_MS = 3000; 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 ActivityManagerService mService;
private final int mUserId; private final int mUserId;