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

RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class

Browse Source 
Bug: 217388602
Bug: 218875965
Test: atest EnterpriseResourcesTests
Test: manual
Change-Id: I4775d7741c7819fd811c3fc4eda1636b1e04b398
This commit is contained in:
kholoud mohamed
2022-03-14 11:11:33 +00:00
parent 45436a025c
commit de78149c16
49 changed files with 160 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -396,16 +396,18 @@ public class ChooseLockGeneric extends SettingsActivity {
}
} else {
if (mIsManagedProfile) {
textView.setText(mDpm.getString(WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE,
textView.setText(mDpm.getResources().getString(
WORK_PROFILE_SCREEN_LOCK_SETUP_MESSAGE,
() -> getString(R.string.lock_settings_picker_profile_message)));
} else {
int profileUserId = Utils.getManagedProfileId(mUserManager, mUserId);
if (mController.isScreenLockRestrictedByAdmin()
&& profileUserId != UserHandle.USER_NULL) {
final StringBuilder description = new StringBuilder(
mDpm.getString(WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK, () ->
getString(
R.string.lock_settings_picker_admin_restricted_personal_message)));
mDpm.getResources().getString(
WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK,
() -> getString(
R.string.lock_settings_picker_admin_restricted_personal_message)));
final LinkifyUtils.OnClickListener clickListener = () -> {
final Bundle extras = new Bundle();
extras.putInt(Intent.EXTRA_USER_ID, profileUserId);

10
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -24,7 +24,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.REENTER_W
import static android.app.admin.DevicePolicyResources.Strings.Settings.REENTER_WORK_PROFILE_PIN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PASSWORD_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PIN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED;
import static android.app.admin.DevicePolicyResources.UNDEFINED;
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE;
import static com.android.internal.widget.PasswordValidationError.CONTAINS_INVALID_CHARACTERS;
@@ -389,7 +389,7 @@ public class ChooseLockPassword extends SettingsActivity {
} else if (type == TYPE_BIOMETRIC) {
return context.getString(alphaHintForBiometrics);
} else if (isProfile) {
return context.getSystemService(DevicePolicyManager.class)
return context.getSystemService(DevicePolicyManager.class).getResources()
.getString(alphaHintOverrideForProfile,
() -> context.getString(alphaHintForProfile));
} else {
@@ -403,7 +403,7 @@ public class ChooseLockPassword extends SettingsActivity {
} else if (type == TYPE_BIOMETRIC) {
return context.getString(numericHintForBiometrics);
} else if (isProfile) {
return context.getSystemService(DevicePolicyManager.class)
return context.getSystemService(DevicePolicyManager.class).getResources()
.getString(numericHintOverrideForProfile,
() -> context.getString(numericHintForProfile));
} else {
@@ -848,11 +848,11 @@ public class ChooseLockPassword extends SettingsActivity {
DevicePolicyManager devicePolicyManager =
getContext().getSystemService(DevicePolicyManager.class);
if (mIsAlphaMode) {
messages.add(devicePolicyManager.getString(
messages.add(devicePolicyManager.getResources().getString(
PASSWORD_RECENTLY_USED,
() -> getString(R.string.lockpassword_password_recently_used)));
} else {
messages.add(devicePolicyManager.getString(
messages.add(devicePolicyManager.getResources().getString(
PIN_RECENTLY_USED,
() -> getString(R.string.lockpassword_pin_recently_used)));
}

2
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -482,7 +482,7 @@ public class ChooseLockPattern extends SettingsActivity {
} else if (mForFace) {
msg = getString(R.string.lockpassword_choose_your_pattern_header_for_face);
} else if (mIsManagedProfile) {
msg = getContext().getSystemService(DevicePolicyManager.class)
msg = getContext().getSystemService(DevicePolicyManager.class).getResources()
.getString(SET_WORK_PROFILE_PATTERN_HEADER,
() -> getString(
R.string.lockpassword_choose_your_profile_pattern_header));

14
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -272,7 +272,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
case LockPatternUtils.CREDENTIAL_TYPE_PIN:
if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(
return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PIN_HEADER,
() -> getString(R.string.lockpassword_confirm_your_work_pin_header));
}
@@ -280,7 +280,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
return getString(R.string.lockpassword_confirm_your_pin_header);
case LockPatternUtils.CREDENTIAL_TYPE_PATTERN:
if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(
return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PATTERN_HEADER,
() -> getString(
R.string.lockpassword_confirm_your_work_pattern_header));
@@ -289,7 +289,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
return getString(R.string.lockpassword_confirm_your_pattern_header);
case LockPatternUtils.CREDENTIAL_TYPE_PASSWORD:
if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(
return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PASSWORD_HEADER,
() -> getString(
R.string.lockpassword_confirm_your_work_password_header));
@@ -305,7 +305,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
switch (credentialType) {
case LockPatternUtils.CREDENTIAL_TYPE_PIN:
if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(WORK_PROFILE_CONFIRM_PIN,
return mDevicePolicyManager.getResources().getString(WORK_PROFILE_CONFIRM_PIN,
() -> getString(
R.string.lockpassword_confirm_your_pin_generic_profile));
}
@@ -313,7 +313,8 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
return getString(R.string.lockpassword_confirm_your_pin_generic);
case LockPatternUtils.CREDENTIAL_TYPE_PATTERN:
if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(WORK_PROFILE_CONFIRM_PATTERN,
return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_CONFIRM_PATTERN,
() -> getString(
R.string.lockpassword_confirm_your_pattern_generic_profile));
}
@@ -321,7 +322,8 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
return getString(R.string.lockpassword_confirm_your_pattern_generic);
case LockPatternUtils.CREDENTIAL_TYPE_PASSWORD:
if (isEffectiveUserManagedProfile) {
return mDevicePolicyManager.getString(WORK_PROFILE_CONFIRM_PASSWORD,
return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_CONFIRM_PASSWORD,
() -> getString(
R.string.lockpassword_confirm_your_password_generic_profile));
}

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

@@ -247,7 +247,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
R.string.lock_last_attempt_before_wipe_warning_title);
final String overrideMessageId = getLastTryOverrideErrorMessageId(userType);
final int defaultMessageId = getLastTryDefaultErrorMessage(userType);
final String message = mDevicePolicyManager.getString(
final String message = mDevicePolicyManager.getResources().getString(
overrideMessageId, () -> getString(defaultMessageId));
LastTryDialog.show(fragmentManager, title, message,
android.R.string.ok, false /* dismiss */);
@@ -279,7 +279,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
case USER_TYPE_PRIMARY:
return getString(R.string.lock_failed_attempts_now_wiping_device);
case USER_TYPE_MANAGED_PROFILE:
return mDevicePolicyManager.getString(WORK_PROFILE_LOCK_ATTEMPTS_FAILED,
return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_LOCK_ATTEMPTS_FAILED,
() -> getString(R.string.lock_failed_attempts_now_wiping_profile));
case USER_TYPE_SECONDARY:
return getString(R.string.lock_failed_attempts_now_wiping_user);

8
src/com/android/settings/password/ConfirmLockPassword.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.password;
import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PASSWORD_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PIN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PASSWORD;
@@ -25,6 +24,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROF
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PIN_ATTEMPT_BEFORE_WIPE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PASSWORD_REQUIRED;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PIN_REQUIRED;
import static android.app.admin.DevicePolicyResources.UNDEFINED;
import android.annotation.Nullable;
import android.app.admin.DevicePolicyManager;
@@ -256,12 +256,12 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
}
if (mIsManagedProfile) {
if (mIsAlpha) {
return mDevicePolicyManager.getString(
return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PASSWORD_HEADER,
() -> getString(
R.string.lockpassword_confirm_your_work_password_header));
}
return mDevicePolicyManager.getString(
return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PIN_HEADER,
() -> getString(R.string.lockpassword_confirm_your_work_pin_header));
}
@@ -278,7 +278,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
// Map boolean flags to an index by isStrongAuth << 2 + isManagedProfile << 1 + isAlpha.
int index = ((isStrongAuthRequired ? 1 : 0) << 2) + ((mIsManagedProfile ? 1 : 0) << 1)
+ (mIsAlpha ? 1 : 0);
return mDevicePolicyManager.getString(
return mDevicePolicyManager.getResources().getString(
DETAIL_TEXT_OVERRIDES[index], () -> getString(DETAIL_TEXTS[index]));
}

10
src/com/android/settings/password/ConfirmLockPattern.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.password;
import static android.app.admin.DevicePolicyResources.Strings.UNDEFINED;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PATTERN_ATTEMPT_BEFORE_WIPE;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PATTERN_REQUIRED;
import static android.app.admin.DevicePolicyResources.UNDEFINED;
import android.annotation.Nullable;
import android.annotation.SuppressLint;
@@ -271,11 +271,13 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
final boolean isStrongAuthRequired = isStrongAuthRequired();
if (mIsManagedProfile) {
if (isStrongAuthRequired) {
return mDevicePolicyManager.getString(WORK_PROFILE_PATTERN_REQUIRED,
return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_PATTERN_REQUIRED,
() -> getString(
R.string.lockpassword_strong_auth_required_work_pattern));
} else {
return mDevicePolicyManager.getString(WORK_PROFILE_CONFIRM_PATTERN,
return mDevicePolicyManager.getResources().getString(
WORK_PROFILE_CONFIRM_PATTERN,
() -> getString(
R.string.lockpassword_confirm_your_pattern_generic_profile));
}
@@ -368,7 +370,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
if (mFrp) return getString(R.string.lockpassword_confirm_your_pattern_header_frp);
if (mIsManagedProfile) {
return mDevicePolicyManager.getString(
return mDevicePolicyManager.getResources().getString(
CONFIRM_WORK_PROFILE_PATTERN_HEADER,
() -> getString(R.string.lockpassword_confirm_your_work_pattern_header));
}

2
src/com/android/settings/password/ForgotPasswordActivity.java
View File

@@ -51,7 +51,7 @@ public class ForgotPasswordActivity extends Activity {
DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class);
TextView forgotPasswordText = (TextView) findViewById(R.id.forgot_password_text);
forgotPasswordText.setText(devicePolicyManager.getString(
forgotPasswordText.setText(devicePolicyManager.getResources().getString(
FORGOT_PASSWORD_TEXT, () -> getString(R.string.forgot_password_text)));
final GlifLayout layout = findViewById(R.id.setup_wizard_layout);