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

am 868acab2: Merge "Rename limited users to restricted profiles" into jb-mr2-dev

Browse Source 
* commit '868acab2a0e82330f6b278f4f93284ca1b6e6225':
  Rename limited users to restricted profiles
This commit is contained in:
Amith Yamasani
2013-04-24 14:58:39 -07:00
committed by Android Git Automerger
parent 90dad6404c 868acab2a0
commit 7200ae73c7
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,10 +383,14 @@ public class UserSettings extends SettingsPreferenceFragment
Dialog dlg = new AlertDialog.Builder(getActivity())
.setTitle(UserHandle.myUserId() == mRemovingUserId
? R.string.user_confirm_remove_self_title
: R.string.user_confirm_remove_title)
: (mUserManager.getUserInfo(mRemovingUserId).isRestricted()
? R.string.user_profile_confirm_remove_title
: R.string.user_confirm_remove_title))
.setMessage(UserHandle.myUserId() == mRemovingUserId
? R.string.user_confirm_remove_self_message
: R.string.user_confirm_remove_message)
: (mUserManager.getUserInfo(mRemovingUserId).isRestricted()
? R.string.user_profile_confirm_remove_message
: R.string.user_confirm_remove_message))
.setPositiveButton(R.string.user_delete_button,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {