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

Merge "Add support messages to device admin pages."

Browse Source
This commit is contained in:
Kenny Guy
2016-01-06 19:55:35 +00:00
committed by Android (Google) Code Review
parent 3f48575e17 7a3555961d
commit e526cf20bb
8 changed files with 228 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,13 +55,7 @@ public final class UserDialogs {
AlertDialog.Builder builder = new AlertDialog.Builder(context)
.setPositiveButton(R.string.user_delete_button, onConfirmListener)
.setNegativeButton(android.R.string.cancel, null);
if (UserHandle.myUserId() == removingUserId) {
builder.setTitle(R.string.user_confirm_remove_self_title);
builder.setMessage(R.string.user_confirm_remove_self_message);
} else if (userInfo.isRestricted()) {
builder.setTitle(R.string.user_profile_confirm_remove_title);
builder.setMessage(R.string.user_profile_confirm_remove_message);
} else if (userInfo.isManagedProfile()) {
if (userInfo.isManagedProfile()) {
builder.setTitle(R.string.work_profile_confirm_remove_title);
View view = createRemoveManagedUserDialogView(context, removingUserId);
if (view != null) {
@@ -69,6 +63,12 @@ public final class UserDialogs {
} else {
builder.setMessage(R.string.work_profile_confirm_remove_message);
}
} else if (UserHandle.myUserId() == removingUserId) {
builder.setTitle(R.string.user_confirm_remove_self_title);
builder.setMessage(R.string.user_confirm_remove_self_message);
} else if (userInfo.isRestricted()) {
builder.setTitle(R.string.user_profile_confirm_remove_title);
builder.setMessage(R.string.user_profile_confirm_remove_message);
} else {
builder.setTitle(R.string.user_confirm_remove_title);
builder.setMessage(R.string.user_confirm_remove_message);