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

[conflict] Singularization of duplicated multi user strings. 2p: 4564bce03c 2p: 39ef1579ef

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17246083

Bug: 191386817
Change-Id: I0217ef2321f836ddb066ffac7214522483c9687f
This commit is contained in:
Presubmit Automerger Backend
2022-03-23 19:21:52 +00:00
committed by Yasin Kilicdere
parent b81c42d043 39ef1579ef
commit 7a76ba8558
5 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -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,12 +278,14 @@ 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.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);
}