Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8502f864 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fixed UserSwitchingDialog theme." into qt-qpr1-dev am: 948ed682 

Change-Id: Iff202dd888e5ac1548b7391b59164225b856fd46
parents 80332ab6 948ed682

core/res/res/values/themes_device_defaults.xml

+1 −0
Original line number Diff line number Diff line
@@ -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">

services/core/java/com/android/server/am/CarUserSwitchingDialog.java

+1 −3
Original line number Diff line number Diff line
@@ -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);

services/core/java/com/android/server/am/UserSwitchingDialog.java

+2 −1
Original line number Diff line number Diff line
@@ -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;