Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf1e59a9 authored by arangelov's avatar arangelov
Browse files

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

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

Bug: 77618738
Test: none
Change-Id: I464f492cd6b1468b85b5a691c29ae7a982ecebff
parent c91339b3

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

    <!-- 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>

    <!-- Message indicating that the device is enterprise-managed: Link to learn more about what a Device Owner app can do [CHAR LIMIT=NONE] -->

    <string name="do_disclosure_learn_more">Learn more</string>

    <!-- Button label to allow the user to view additional information [CHAR LIMIT=NONE BACKUP_MESSAGE_ID=2416766240581561009] -->

    <string name="learn_more">Learn more</string>









    <!-- 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] -->

























src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -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();
































src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -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;









    }
































src/com/android/settings/wifi/WifiScanningRequiredFragment.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -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);









        }









    }










































tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -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);