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

Commit 5b6699c0 authored by Yasin Kilicdere's avatar Yasin Kilicdere Committed by Automerger Merge Worker
Browse files

Merge "Update UI to show feedback while creating Guest from Settings." into tm-dev am: 61dd88e8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084565

Change-Id: Ice7244492903b3c51a82e99bf53bf48fb09c0bdd
parents 27cba164 61dd88e8
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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>
+9 −3
Original line number Diff line number Diff line
@@ -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);