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

Commit ef3a63ce authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "Changing user switching messages for demo mode" into nyc-mr1-dev 

am: 5ac8499b

* commit '5ac8499b':
  Changing user switching messages for demo mode

Change-Id: I822aed2c9762f680e3697c18e759168c2a72b1f2
parents 64fc84e9 5ac8499b

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -4370,6 +4370,12 @@ 
    <string name="reset_retail_demo_mode_title">Restart Session</string>

    <!-- Text of notification to start a new demo session when device is in retail mode [CHAR LIMIT=NONE] -->

    <string name="reset_retail_demo_mode_text">Tap to start a new demo session</string>

    <!-- Text of dialog shown when starting a demo user for the first time [CHAR LIMIT=40] -->

    <string name="demo_starting_message">Starting demo</string>

    <!-- Text of dialog shown when starting a new demo user in retail demo mode [CHAR LIMIT=40] -->

    <string name="demo_restarting_message">Restarting session</string>







    <!-- Title of notification shown when device has been forced to safe mode after a security compromise. -->

    <string name="audit_safemode_notification">Factory reset to use this device without restrictions</string>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,9 @@ 
  <java-symbol type="string" name="config_ethernet_tcp_buffers" />

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

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

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

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





  <java-symbol type="plurals" name="bugreport_countdown" />

  <java-symbol type="plurals" name="duration_hours" />

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

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ final class UserSwitchingDialog extends AlertDialog 
        String viewMessage;

        if (UserManager.isSplitSystemUser() && newUser.id == UserHandle.USER_SYSTEM) {

            viewMessage = res.getString(R.string.user_logging_out_message, oldUser.name);

        } else if (UserManager.isDeviceInDemoMode(context)) {

            if (oldUser.isDemo()) {

                viewMessage = res.getString(R.string.demo_restarting_message);

            } else {

                viewMessage = res.getString(R.string.demo_starting_message);

            }

        } else {

            viewMessage = res.getString(R.string.user_switching_message, newUser.name);

        }