diff options
| author | arangelov <arangelov@google.com> | 2018-04-06 13:59:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-06 13:59:46 -0700 |
| commit | 9993ea833a5a5d21e13949209f333af17b81de34 (patch) | |
| tree | c9e6ee25815f08f3d9f5e71c0a94f7cebe16a2fe /src/com/android/settings/enterprise | |
| parent | ebb18819b70c10d5e4413f530b8c58f2589b3646 (diff) | |
| parent | a739a638800ea4e93bf60f4422383e2cfa79861d (diff) | |
| download | packages_apps_Settings-9993ea833a5a5d21e13949209f333af17b81de34.tar.gz packages_apps_Settings-9993ea833a5a5d21e13949209f333af17b81de34.tar.bz2 packages_apps_Settings-9993ea833a5a5d21e13949209f333af17b81de34.zip | |
Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev am: 22a12c0ea2
am: a739a63880
Change-Id: Ib61bc1739cff8b7cb63ead4104febc553d4d0c45
Diffstat (limited to 'src/com/android/settings/enterprise')
| -rw-r--r-- | src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index ff43e6e6a2..1c1d2f39fd 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 eead69f878..ab985f0526 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; } |