diff --git a/res/values/strings.xml b/res/values/strings.xml index 67c564ed98e..15e399d9c85 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9590,8 +9590,8 @@ This device is managed by %s. " " - - Learn more + + Learn more diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index ff43e6e6a22..1c1d2f39fdb 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -72,7 +72,7 @@ public class ActionDisabledByAdminDialogHelper { mRestriction); return builder .setPositiveButton(R.string.okay, null) - .setNeutralButton(R.string.admin_more_details, + .setNeutralButton(R.string.learn_more, (dialog, which) -> { showAdminPolicies(mEnforcedAdmin, mActivity); mActivity.finish(); diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java index eead69f8787..ab985f0526a 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java @@ -107,7 +107,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe disclosure.append(mResources.getString(R.string.do_disclosure_generic)); } disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator)); - disclosure.append(mResources.getString(R.string.do_disclosure_learn_more), + disclosure.append(mResources.getString(R.string.learn_more), new EnterprisePrivacySpan(mContext), 0); return disclosure; } diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index 4ff023d3ef9..bf24bbcd9c1 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -92,7 +92,7 @@ public class WifiScanningRequiredFragment extends InstrumentedDialogFragment imp void addButtonIfNeeded(AlertDialog.Builder builder) { // Only show "learn more" if there is a help page to show if (!TextUtils.isEmpty(getContext().getString(R.string.help_uri_wifi_scanning_required))) { - builder.setNeutralButton(R.string.do_disclosure_learn_more, this); + builder.setNeutralButton(R.string.learn_more, this); } } diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index 40371d75a07..fb65e5da4b4 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -126,7 +126,7 @@ public class EnterprisePrivacyFeatureProviderImplTest { SpannableStringBuilder disclosure = new SpannableStringBuilder(); disclosure.append(mResources.getString(R.string.do_disclosure_generic)); disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator)); - disclosure.append(mResources.getString(R.string.do_disclosure_learn_more), + disclosure.append(mResources.getString(R.string.learn_more), new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0); when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER); when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null); @@ -136,7 +136,7 @@ public class EnterprisePrivacyFeatureProviderImplTest { disclosure.append(mResources.getString(R.string.do_disclosure_with_name, OWNER_ORGANIZATION)); disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator)); - disclosure.append(mResources.getString(R.string.do_disclosure_learn_more), + disclosure.append(mResources.getString(R.string.learn_more), new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0); when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(OWNER_ORGANIZATION); assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);