PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix "Remove Guest" option shows "Reset Guest" dialog" into tm-dev

Browse Source
This commit is contained in:
Anna Bauza
2022-03-30 11:57:19 +00:00
committed by Android (Google) Code Review
parent 4dcf05657e ee23152051
commit a5f29f2e93
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -209,8 +209,13 @@ public class UserDetailsSettings extends SettingsPreferenceFragment
}
});
case DIALOG_CONFIRM_RESET_GUEST:
return UserDialogs.createResetGuestDialog(getActivity(),
if (mGuestUserAutoCreated) {
return UserDialogs.createResetGuestDialog(getActivity(),
(dialog, which) -> resetGuest());
} else {
return UserDialogs.createRemoveGuestDialog(getActivity(),
(dialog, which) -> resetGuest());
}
}
throw new IllegalArgumentException("Unsupported dialogId " + dialogId);
}

21
src/com/android/settings/users/UserDialogs.java
View File

@@ -196,4 +196,25 @@ public final class UserDialogs {
.setNegativeButton(android.R.string.cancel, null)
.create();
}
/**
* Creates a dialog to confirm with the user if it's ok to remove the guest user, which will
* delete all the guest user's data.
*
* @param context a Context object
* @param onConfirmListener Callback object for positive action
* @return the created Dialog
*/
public static Dialog createRemoveGuestDialog(Context context,
DialogInterface.OnClickListener onConfirmListener) {
return new AlertDialog.Builder(context)
.setTitle(com.android.settingslib.R.string.guest_remove_guest_dialog_title)
.setMessage(R.string.user_exit_guest_confirm_message)
.setPositiveButton(
com.android.settingslib.R.string.guest_remove_guest_confirm_button,
onConfirmListener)
.setNegativeButton(android.R.string.cancel, null)
.create();
}
}

7
src/com/android/settings/users/UserSettings.java
View File

@@ -737,8 +737,13 @@ public class UserSettings extends SettingsPreferenceFragment
return buildAddUserDialog(USER_TYPE_RESTRICTED_PROFILE);
}
case DIALOG_CONFIRM_RESET_GUEST: {
return UserDialogs.createResetGuestDialog(getActivity(),
if (mGuestUserAutoCreated) {
return UserDialogs.createResetGuestDialog(getActivity(),
(dialog, which) -> resetGuest());
} else {
return UserDialogs.createRemoveGuestDialog(getActivity(),
(dialog, which) -> resetGuest());
}
}
default:
return null;