diff options
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/users/UserCreatingDialog.java | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index da0381b68278..e524405a39d5 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1426,8 +1426,12 @@ <string name="user_switch_to_user">Switch to <xliff:g id="user_name" example="John Doe">%s</xliff:g></string> <!-- Dialog message when creating a new user [CHAR LIMIT=NONE] --> <string name="creating_new_user_dialog_message">Creating new user…</string> + <!-- Dialog message when creating a new guest [CHAR LIMIT=NONE] --> + <string name="creating_new_guest_dialog_message">Creating new guest…</string> <!-- Text shown to notify that the creation of new user has failed. [CHAR LIMIT=40] --> <string name="add_user_failed">Failed to create a new user</string> + <!-- Text shown to notify that the creation of new guest has failed. [CHAR LIMIT=40] --> + <string name="add_guest_failed">Failed to create a new guest</string> <!-- Title for the preference to enter the nickname of the user to display in the user switcher [CHAR LIMIT=25]--> <string name="user_nickname">Nickname</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/users/UserCreatingDialog.java b/packages/SettingsLib/src/com/android/settingslib/users/UserCreatingDialog.java index 075635c87b1b..dd86bec9126c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/UserCreatingDialog.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/UserCreatingDialog.java @@ -31,11 +31,15 @@ import com.android.settingslib.R; public class UserCreatingDialog extends AlertDialog { public UserCreatingDialog(Context context) { + this(context, false); + } + + public UserCreatingDialog(Context context, boolean isGuest) { // hardcoding theme to be consistent with UserSwitchingDialog's theme // todo replace both to adapt to the device's theme super(context, com.android.internal.R.style.Theme_DeviceDefault_Light_Dialog_Alert); - inflateContent(); + inflateContent(isGuest); getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR); WindowManager.LayoutParams attrs = getWindow().getAttributes(); @@ -44,12 +48,14 @@ public class UserCreatingDialog extends AlertDialog { getWindow().setAttributes(attrs); } - private void inflateContent() { + private void inflateContent(boolean isGuest) { // using the same design as UserSwitchingDialog setCancelable(false); View view = LayoutInflater.from(getContext()) .inflate(R.layout.user_creation_progress_dialog, null); - String message = getContext().getString(R.string.creating_new_user_dialog_message); + String message = getContext().getString(isGuest + ? R.string.creating_new_guest_dialog_message + : R.string.creating_new_user_dialog_message); view.setAccessibilityPaneTitle(message); ((TextView) view.findViewById(R.id.message)).setText(message); setView(view); |