diff options
author | Colin Cross <ccross@android.com> | 2019-05-02 19:56:42 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2019-05-13 13:42:01 -0700 |
commit | 807e8611052be62491bcf45887bb893befc07af7 (patch) | |
tree | 935afe7675912a2456b4c2f5ca6654c2afec3a60 /src/com/android/settings/users | |
parent | 90cb5628bb2e5785429caac5aca7e42bb101ed4e (diff) | |
download | packages_apps_Settings-807e8611052be62491bcf45887bb893befc07af7.tar.gz packages_apps_Settings-807e8611052be62491bcf45887bb893befc07af7.tar.bz2 packages_apps_Settings-807e8611052be62491bcf45887bb893befc07af7.zip |
Use if instead of switch for resources
Converting to Soong will move some code from directly compiled
into the app to compiled into an Android library and then
shared between the app and the tests. This will cause resource
IDs in the library to become non-final, which means they can
no longer be used in case statements. Convert affect case
statements to if blocks.
Test: m RunSettingsRoboTests
Change-Id: I25742a374f06d3fa4decbfc0d223a350acc50881
Diffstat (limited to 'src/com/android/settings/users')
-rw-r--r-- | src/com/android/settings/users/UserSettings.java | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 98263e29af..7acf576441 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -1086,21 +1086,18 @@ public class UserSettings extends SettingsPreferenceFragment public void onClick(View v) { if (v.getTag() instanceof UserPreference) { int userId = ((UserPreference) v.getTag()).getUserId(); - switch (v.getId()) { - case UserPreference.DELETE_ID: - final EnforcedAdmin removeDisallowedAdmin = - RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getContext(), - UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId()); - if (removeDisallowedAdmin != null) { - RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), - removeDisallowedAdmin); - } else { - onRemoveUserClicked(userId); - } - break; - case UserPreference.SETTINGS_ID: - onManageUserClicked(userId, false); - break; + if (v.getId() == UserPreference.DELETE_ID) { + final EnforcedAdmin removeDisallowedAdmin = + RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getContext(), + UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId()); + if (removeDisallowedAdmin != null) { + RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), + removeDisallowedAdmin); + } else { + onRemoveUserClicked(userId); + } + } else if (v.getId() == UserPreference.SETTINGS_ID) { + onManageUserClicked(userId, false); } } } |