diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-08-06 18:21:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-06 18:21:28 +0000 |
| commit | 279a8dfc4077ab6623213da17954e307806cddc8 (patch) | |
| tree | 42c3232f26cd0e1aa472b96011c4b25da6cb62ee /src/com/android/settings/Settings.java | |
| parent | 6ada2d5547a161578b54e7b8ca979f06b6c911ff (diff) | |
| parent | 0aa1dc70c5360f1e2ff251b6d1793860f1669684 (diff) | |
| download | packages_apps_Settings-279a8dfc4077ab6623213da17954e307806cddc8.zip packages_apps_Settings-279a8dfc4077ab6623213da17954e307806cddc8.tar.gz packages_apps_Settings-279a8dfc4077ab6623213da17954e307806cddc8.tar.bz2 | |
Merge "Remove Restrictions UI"
Diffstat (limited to 'src/com/android/settings/Settings.java')
| -rw-r--r-- | src/com/android/settings/Settings.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 720af59..4221059 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -136,7 +136,6 @@ public class Settings extends PreferenceActivity R.id.location_settings, R.id.security_settings, R.id.language_settings, - R.id.restriction_settings, R.id.user_settings, R.id.account_settings, R.id.account_add, @@ -560,11 +559,6 @@ public class Settings extends PreferenceActivity if (um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) { target.remove(i); } - } else if (id == R.id.restriction_settings) { - if (um.isLinkedUser() - || um.hasUserRestriction(UserManager.DISALLOW_APP_RESTRICTIONS)) { - target.remove(i); - } } if (i < target.size() && target.get(i) == header |