From 4564bce03cfbd4ca99e86673c7edac8bd2ac8b50 Mon Sep 17 00:00:00 2001 From: Yasin Kilicdere Date: Thu, 17 Mar 2022 23:08:52 +0000 Subject: [PATCH] Singularization of duplicated multi user strings. Many multi-user strings were duplicated between SettingsLib, Settings, System UI and Car projects. This CL removes those duplicates. List of singularized strings: "Guest", "Remove guest", "Add user", "Remove guest?", "Too many incorrect attempts...." Bug: 191386817 Test: NA Change-Id: I8d9629a1a9628cab9f049df84f706bd04ee75cc2 --- res/values/strings.xml | 17 ----------------- .../ConfirmDeviceCredentialBaseFragment.java | 11 +++++++---- .../settings/users/UserDetailsSettings.java | 2 +- .../android/settings/users/UserSettings.java | 12 ++++++------ .../settings/users/UserDetailsSettingsTest.java | 2 +- 5 files changed, 15 insertions(+), 29 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d3532cc72b..b8d1325ebea 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1586,15 +1586,6 @@ If you enter an incorrect password on the next attempt, your work profile and its data will be deleted - - Too many incorrect attempts. This device\'s data will be deleted. - - Too many incorrect attempts. This user will be deleted. - - Too many incorrect attempts. This work profile and its data will be deleted. - - Dismiss - Must contain at least %d character @@ -7640,8 +7631,6 @@ Users & profiles Add user or profile - - Add user Restricted profile @@ -7702,12 +7691,6 @@ Delete - - Guest - - Remove guest - - Remove guest? All apps and data in this session will be deleted. diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java index 793f6001698..73795dde056 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java @@ -255,7 +255,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr // Device, profile, or secondary user is wiped final String message = getWipeMessage(userType); LastTryDialog.show(fragmentManager, null /* title */, message, - R.string.lock_failed_attempts_now_wiping_dialog_dismiss, true /* dismiss */); + com.android.settingslib.R.string.failed_attempts_now_wiping_dialog_dismiss, + true /* dismiss */); } } @@ -277,13 +278,15 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr private String getWipeMessage(int userType) { switch (userType) { case USER_TYPE_PRIMARY: - return getString(R.string.lock_failed_attempts_now_wiping_device); + return getString(com.android.settingslib + .R.string.failed_attempts_now_wiping_device); case USER_TYPE_MANAGED_PROFILE: return mDevicePolicyManager.getResources().getString( WORK_PROFILE_LOCK_ATTEMPTS_FAILED, - () -> getString(R.string.lock_failed_attempts_now_wiping_profile)); + () -> getString(com.android.settingslib + .R.string.failed_attempts_now_wiping_profile)); case USER_TYPE_SECONDARY: - return getString(R.string.lock_failed_attempts_now_wiping_user); + return getString(com.android.settingslib.R.string.failed_attempts_now_wiping_user); default: throw new IllegalArgumentException("Unrecognized user type:" + userType); } diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index a3c8e696e26..f60aec73d2c 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -297,7 +297,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment !mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS)); mRemoveUserPref.setTitle(mGuestUserAutoCreated ? com.android.settingslib.R.string.guest_reset_guest - : R.string.user_exit_guest_title); + : com.android.settingslib.R.string.guest_exit_guest); if (mGuestUserAutoCreated) { mRemoveUserPref.setEnabled((mUserInfo.flags & UserInfo.FLAG_INITIALIZED) != 0); } diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 0f2eb66bcea..139d5b0ede6 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -310,7 +310,7 @@ public class UserSettings extends SettingsPreferenceFragment mAddUser = findPreference(KEY_ADD_USER); if (!mUserCaps.mCanAddRestrictedProfile) { // Label should only mention adding a "user", not a "profile" - mAddUser.setTitle(R.string.user_add_user_menu); + mAddUser.setTitle(com.android.settingslib.R.string.user_add_user); } mAddUser.setOnPreferenceClickListener(this); @@ -425,9 +425,9 @@ public class UserSettings extends SettingsPreferenceFragment if (isCurrentUserGuest()) { // No need to load profile information mMePreference.setIcon(getEncircledDefaultIcon()); - mMePreference.setTitle( - mGuestUserAutoCreated ? com.android.settingslib.R.string.guest_reset_guest - : R.string.user_exit_guest_title); + mMePreference.setTitle(mGuestUserAutoCreated + ? com.android.settingslib.R.string.guest_reset_guest + : com.android.settingslib.R.string.guest_exit_guest); mMePreference.setSelectable(true); // removing a guest will result in switching back to the admin user mMePreference.setEnabled(canSwitchUserNow()); @@ -704,7 +704,7 @@ public class UserSettings extends SettingsPreferenceFragment } case DIALOG_CONFIRM_EXIT_GUEST: { Dialog dlg = new AlertDialog.Builder(context) - .setTitle(R.string.user_exit_guest_confirm_title) + .setTitle(com.android.settingslib.R.string.guest_remove_guest_dialog_title) .setMessage(R.string.user_exit_guest_confirm_message) .setPositiveButton(R.string.user_exit_guest_dialog_remove, new DialogInterface.OnClickListener() { @@ -1157,7 +1157,7 @@ public class UserSettings extends SettingsPreferenceFragment mAddGuest.setIcon(centerAndTint(icon)); mAddGuest.setSelectable(true); if (mGuestUserAutoCreated && mGuestCreationScheduled.get()) { - mAddGuest.setTitle(com.android.settingslib.R.string.user_guest); + mAddGuest.setTitle(com.android.internal.R.string.guest_name); mAddGuest.setSummary(R.string.guest_resetting); mAddGuest.setEnabled(false); } else { diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java index 6b2c07660cd..ccd2190db47 100644 --- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java @@ -373,7 +373,7 @@ public class UserDetailsSettingsTest { mFragment.initialize(mActivity, mArguments); verify(mRemoveUserPref).setOnPreferenceClickListener(mFragment); - verify(mRemoveUserPref).setTitle(R.string.user_exit_guest_title); + verify(mRemoveUserPref).setTitle(com.android.settingslib.R.string.guest_exit_guest); verify(mFragment, never()).removePreference(KEY_REMOVE_USER); }