Merge "Remove Restrictions UI"

This commit is contained in:
Amith Yamasani
2013-08-06 18:21:28 +00:00
committed by Android (Google) Code Review
3 changed files with 0 additions and 166 deletions

View File

@@ -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