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

Merge "Update strings for removing work profile" into lmp-dev

Browse Source
This commit is contained in:
Alexandra Gherghina
2014-08-22 12:53:28 +00:00
committed by Android (Google) Code Review
parent 9c4d5dd86b 4c96267acd
commit 9239d6d0a2
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -5246,12 +5246,16 @@
<string name="user_confirm_remove_title">Remove this user?</string>
<!-- Profile removal confirmation title [CHAR LIMIT=25] -->
<string name="user_profile_confirm_remove_title">Remove this profile?</string>
<!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
<string name="work_profile_confirm_remove_title">Remove work profile?</string>
<!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
<string name="user_confirm_remove_self_message" product="tablet">You will lose your space and data on this tablet. You can\'t undo this action.</string>
<!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
<string name="user_confirm_remove_self_message" product="default">You will lose your space and data on this phone. You can\'t undo this action.</string>
<!-- User removal confirmation message [CHAR LIMIT=none] -->
<string name="user_confirm_remove_message">All apps and data will be deleted.</string>
<!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
<string name="work_profile_confirm_remove_message">All apps and data in this profile will be deleted.</string>
<!-- User profile removal confirmation message [CHAR LIMIT=none] -->
<string name="user_profile_confirm_remove_message">All apps and data will be deleted.</string>
<!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->

27
src/com/android/settings/Utils.java
View File

@@ -774,17 +774,24 @@ public final class Utils {
DialogInterface.OnClickListener onConfirmListener) {
UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
UserInfo userInfo = um.getUserInfo(removingUserId);
int titleResId;
int messageResId;
if (UserHandle.myUserId() == removingUserId) {
titleResId = R.string.user_confirm_remove_self_title;
messageResId = R.string.user_confirm_remove_self_message;
} else if (userInfo.isRestricted()) {
titleResId = R.string.user_profile_confirm_remove_title;
messageResId = R.string.user_profile_confirm_remove_message;
} else if (userInfo.isManagedProfile()) {
titleResId = R.string.work_profile_confirm_remove_title;
messageResId = R.string.work_profile_confirm_remove_message;
} else {
titleResId = R.string.user_confirm_remove_title;
messageResId = R.string.user_confirm_remove_message;
}
Dialog dlg = new AlertDialog.Builder(context)
.setTitle(UserHandle.myUserId() == removingUserId
? R.string.user_confirm_remove_self_title
: (userInfo.isRestricted()
? R.string.user_profile_confirm_remove_title
: R.string.user_confirm_remove_title))
.setMessage(UserHandle.myUserId() == removingUserId
? R.string.user_confirm_remove_self_message
: (userInfo.isRestricted()
? R.string.user_profile_confirm_remove_message
: R.string.user_confirm_remove_message))
.setTitle(titleResId)
.setMessage(messageResId)
.setPositiveButton(R.string.user_delete_button,
onConfirmListener)
.setNegativeButton(android.R.string.cancel, null)