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

Change "More details" to "Learn more" in policy transparency dialog.

Browse Source 
Screenshot: https://screenshot.googleplex.com/5xrwW3g29qa.png

Bug: 77618738
Test: none
Change-Id: I464f492cd6b1468b85b5a691c29ae7a982ecebff
This commit is contained in:
arangelov
2018-04-05 15:05:12 +01:00
parent c91339b3ce
commit cf1e59a960
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -9590,8 +9590,8 @@
<string name="do_disclosure_with_name">This device is managed by <xliff:g id="organization_name" example="Foo, Inc.">%s</xliff:g>.</string> <string name="do_disclosure_with_name">This device is managed by <xliff:g id="organization_name" example="Foo, Inc.">%s</xliff:g>.</string>
<!-- Message indicating that the device is enterprise-managed: Space that separates the main text and the "learn more" link that follows it. [CHAR LIMIT=NONE] --> <!-- Message indicating that the device is enterprise-managed: Space that separates the main text and the "learn more" link that follows it. [CHAR LIMIT=NONE] -->
<string name="do_disclosure_learn_more_separator">" "</string> <string name="do_disclosure_learn_more_separator">" "</string>
<!-- Message indicating that the device is enterprise-managed: Link to learn more about what a Device Owner app can do [CHAR LIMIT=NONE] --> <!-- Button label to allow the user to view additional information [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=2416766240581561009] -->
<string name="do_disclosure_learn_more">Learn more</string> <string name="learn_more">Learn more</string>
<!-- Strings for displaying which applications were set as default for specific actions. --> <!-- Strings for displaying which applications were set as default for specific actions. -->
<!-- Title for the apps that have been set as default handlers of camera-related intents. [CHAR LIMIT=30] --> <!-- Title for the apps that have been set as default handlers of camera-related intents. [CHAR LIMIT=30] -->

2
src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
View File

@@ -72,7 +72,7 @@ public class ActionDisabledByAdminDialogHelper {
mRestriction); mRestriction);
return builder return builder
.setPositiveButton(R.string.okay, null) .setPositiveButton(R.string.okay, null)
.setNeutralButton(R.string.admin_more_details, .setNeutralButton(R.string.learn_more,
(dialog, which) -> { (dialog, which) -> {
showAdminPolicies(mEnforcedAdmin, mActivity); showAdminPolicies(mEnforcedAdmin, mActivity);
mActivity.finish(); mActivity.finish();

2
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -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_generic));
} }
disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator)); 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); new EnterprisePrivacySpan(mContext), 0);
return disclosure; return disclosure;
} }

2
src/com/android/settings/wifi/WifiScanningRequiredFragment.java
View File

@@ -92,7 +92,7 @@ public class WifiScanningRequiredFragment extends InstrumentedDialogFragment imp
void addButtonIfNeeded(AlertDialog.Builder builder) { void addButtonIfNeeded(AlertDialog.Builder builder) {
// Only show "learn more" if there is a help page to show // Only show "learn more" if there is a help page to show
if (!TextUtils.isEmpty(getContext().getString(R.string.help_uri_wifi_scanning_required))) { 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);
} }
} }

4
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
View File

@@ -126,7 +126,7 @@ public class EnterprisePrivacyFeatureProviderImplTest {
SpannableStringBuilder disclosure = new SpannableStringBuilder(); SpannableStringBuilder disclosure = new SpannableStringBuilder();
disclosure.append(mResources.getString(R.string.do_disclosure_generic)); 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_separator));
disclosure.append(mResources.getString(R.string.do_disclosure_learn_more), disclosure.append(mResources.getString(R.string.learn_more),
new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0); new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);
when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER); when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null); when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null);
@@ -136,7 +136,7 @@ public class EnterprisePrivacyFeatureProviderImplTest {
disclosure.append(mResources.getString(R.string.do_disclosure_with_name, disclosure.append(mResources.getString(R.string.do_disclosure_with_name,
OWNER_ORGANIZATION)); OWNER_ORGANIZATION));
disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator)); 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); new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);
when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(OWNER_ORGANIZATION); when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(OWNER_ORGANIZATION);
assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure); assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);