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

Commit bc1a59fe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use a specific theme for the car user switching dialog."

parents 1f034852 62df70b0

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3515,6 +3515,7 @@ 
  <java-symbol type="layout" name="car_user_switching_dialog" />

  <java-symbol type="id" name="user_loading_avatar" />

  <java-symbol type="id" name="user_loading" />

  <java-symbol type="style" name="Theme.DeviceDefault.Light.Dialog.Alert.UserSwitchingDialog" />



  <java-symbol type="string" name="battery_saver_description_with_learn_more" />

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

+3 −1
Original line number Diff line number Diff line
@@ -65,7 +65,9 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog { 
        setCancelable(false);

        Resources res = getContext().getResources();

        // Custom view due to alignment and font size requirements

        View view = LayoutInflater.from(getContext()).inflate(R.layout.car_user_switching_dialog,

        getContext().setTheme(R.style.Theme_DeviceDefault_Light_Dialog_Alert_UserSwitchingDialog);

        View view = LayoutInflater.from(getContext()).inflate(

                R.layout.car_user_switching_dialog,

                null);



        UserManager userManager =