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

Commit 193e0bed authored by Bartosz Fabianowski's avatar Bartosz Fabianowski
Browse files

Finalize strings for enterprise privacy 

A few more final string tweaks for the enterprise privacy page.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: Ib955aa5a6e756748ed7422021099234ad3fefa8b
parent 9757ba4a

res/values/strings.xml

+13 −18
Original line number Diff line number Diff line
@@ -8217,16 +8217,6 @@ 
    <string name="enterprise_privacy_enterprise_data">Data associated with your work account, such as email and calendar</string>

    <!-- Label explaining that the admin can see apps installed on the device. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_installed_packages">List of apps on your device</string>

    <!-- Summary indicating the number of apps that a label (e.g. installed apps or apps granted a particular permission) refers to. [CHAR LIMIT=NONE] -->

    <plurals name="enterprise_privacy_number_packages">

        <item quantity="one"><xliff:g id="count">%d</xliff:g> app</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> apps</item>

    </plurals>

    <!-- Summary indicating the number of apps that a label (e.g. installed apps or apps granted a particular permission) refers to. [CHAR LIMIT=NONE] -->

    <plurals name="enterprise_privacy_number_packages_actionable">

        <item quantity="one"><xliff:g id="count">%d</xliff:g> app. Tap to view.</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> apps. Tap to view.</item>

    </plurals>

    <!-- Label explaining that the admin can see app usage statistics. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_usage_stats">Time and data spent in each app on your device</string>

    <!-- Label explaining that the admin can retrieve network logs on the device. [CHAR LIMIT=NONE] -->
@@ -8239,6 +8229,11 @@ 
    <string name="enterprise_privacy_none">None</string>

    <!-- Label indicating that the admin installed one or more apps on the device. -->

    <string name="enterprise_privacy_enterprise_installed_packages">Apps installed</string>

    <!-- Summary indicating the number of apps that a label (e.g. installed apps or apps granted a particular permission) refers to. The number shown is a minimum as there may be additional apps we do not know about. [CHAR LIMIT=NONE] -->

    <plurals name="enterprise_privacy_number_packages_lower_bound">

        <item quantity="one">Minimum <xliff:g id="count">%d</xliff:g> app</item>

        <item quantity="other">Minimum <xliff:g id="count">%d</xliff:g> apps</item>

    </plurals>

    <!-- Label indicating that the admin granted one or more apps access to the device's location. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_location_access">Location permissions</string>

    <!-- Label indicating that the admin granted one or more apps access to the microphone. [CHAR LIMIT=NONE] -->
@@ -8247,6 +8242,11 @@ 
    <string name="enterprise_privacy_camera_access">Camera permissions</string>

    <!-- Label indicating that the admin set one or more apps as defaults for common actions (e.g. open browser, send e-mail). [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_enterprise_set_default_apps">Default apps</string>

    <!-- Summary indicating the number of apps that a label (e.g. installed apps or apps granted a particular permission) refers to. [CHAR LIMIT=NONE] -->

    <plurals name="enterprise_privacy_number_packages">

        <item quantity="one"><xliff:g id="count">%d</xliff:g> app</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> apps</item>

    </plurals>

    <!-- Label explaining that the current input method was set by the admin. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_input_method">Default keyboard</string>

    <!-- Summary indicating the input method set by the admin. [CHAR LIMIT=NONE] -->
@@ -8261,15 +8261,10 @@ 
    <string name="enterprise_privacy_global_http_proxy">Global HTTP proxy set</string>

    <!-- Label explaining that the admin installed trusted CA certificates. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_ca_certs">Trusted credentials</string>

    <!-- Summary indicating the number of trusted CA certificates installed by the admin. [CHAR LIMIT=NONE] -->

    <!-- Summary indicating the number of trusted CA certificates installed by the admin. The number shown is a minimum as there may be additional CA certificates we do not know about. [CHAR LIMIT=NONE] -->

    <plurals name="enterprise_privacy_number_ca_certs">

        <item quantity="one"><xliff:g id="count">%d</xliff:g> CA certificate</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> CA certificates</item>

    </plurals>

    <!-- Summary indicating the number of trusted CA certificates installed by the admin. [CHAR LIMIT=NONE] -->

    <plurals name="enterprise_privacy_number_ca_certs_actionable">

        <item quantity="one"><xliff:g id="count">%d</xliff:g> CA certificate. Tap to view.</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> CA certificates. Tap to view.</item>

        <item quantity="one">Minimum <xliff:g id="count">%d</xliff:g> CA certificate</item>

        <item quantity="other">Minimum <xliff:g id="count">%d</xliff:g> CA certificates</item>

    </plurals>

    <!-- Label explaining that the admin can lock the device and change the user's password. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_lock_device">Admin can lock the device and reset password</string>

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

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ public abstract class AdminGrantedPermissionsPreferenceControllerBase 
                    } else {

                        preference.setVisible(true);

                        preference.setSummary(mContext.getResources().getQuantityString(

                                R.plurals.enterprise_privacy_number_packages_actionable, num, num));

                                R.plurals.enterprise_privacy_number_packages_lower_bound,

                                num, num));

                    }

                });

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ public class EnterpriseInstalledPackagesPreferenceController 
                    } else {

                        preference.setVisible(true);

                        preference.setSummary(mContext.getResources().getQuantityString(

                                R.plurals.enterprise_privacy_number_packages, num, num));

                                R.plurals.enterprise_privacy_number_packages_lower_bound, num,

                                num));

                    }

                });

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ public abstract class AdminGrantedPermissionsPreferenceControllerTestBase { 


        setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);

        when(mContext.getResources().getQuantityString(

                R.plurals.enterprise_privacy_number_packages_actionable,20, 20))

                .thenReturn("20 packages");

                R.plurals.enterprise_privacy_number_packages_lower_bound, 20, 20))

                .thenReturn("minimum 20 apps");

        mController.updateState(preference);

        assertThat(preference.getSummary()).isEqualTo("20 packages");

        assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");

        assertThat(preference.isVisible()).isTrue();

    }

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

+4 −3
Original line number Diff line number Diff line
@@ -87,10 +87,11 @@ public final class EnterpriseInstalledPackagesPreferenceControllerTest { 
        assertThat(preference.isVisible()).isFalse();



        setNumberOfEnterpriseInstalledPackages(20, true /* async */);

        when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_packages,

                20, 20)).thenReturn("20 packages");

        when(mContext.getResources().getQuantityString(

                R.plurals.enterprise_privacy_number_packages_lower_bound, 20, 20))

                .thenReturn("minimum 20 apps");

        mController.updateState(preference);

        assertThat(preference.getSummary()).isEqualTo("20 packages");

        assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");

        assertThat(preference.isVisible()).isTrue();

    }