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

Commit f51c7e13 authored by Azhara Assanova's avatar Azhara Assanova Committed by Android (Google) Code Review
Browse files

Merge "Update summaries of preferences controlled by Advanced Protection" into main

parents b1b58519 5f2ee05f

packages/SettingsLib/RestrictedLockUtils/res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -21,8 +21,4 @@ 
    <string name="enabled_by_admin">Enabled by admin</string>

    <!-- Summary for switch preference to denote it is switched off by an admin [CHAR LIMIT=50] -->

    <string name="disabled_by_admin">Disabled by admin</string>

    <!-- Summary for switch preference to denote it is switched on by Advanced protection [CHAR LIMIT=50] -->

    <string name="enabled_by_advanced_protection">Enabled by Advanced Protection</string>

    <!-- Summary for switch preference to denote it is switched off by Advanced protection [CHAR LIMIT=50] -->

    <string name="disabled_by_advanced_protection">Disabled by Advanced Protection</string>

</resources>

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictedMode.kt

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ internal data class BlockedByAdminImpl( 
) : BlockedByAdmin {

    override fun getSummary(checked: Boolean?) = when (checked) {

        true -> enterpriseRepository.getAdminSummaryString(

            advancedProtectionStringId = R.string.enabled_by_advanced_protection,

            advancedProtectionStringId = com.android.settingslib.R.string.enabled,

            updatableStringId = Settings.ENABLED_BY_ADMIN_SWITCH_SUMMARY,

            resId = R.string.enabled_by_admin,

            enforcedAdmin = enforcedAdmin,
@@ -54,7 +54,7 @@ internal data class BlockedByAdminImpl( 
        )



        false -> enterpriseRepository.getAdminSummaryString(

            advancedProtectionStringId = R.string.disabled_by_advanced_protection,

            advancedProtectionStringId = com.android.settingslib.R.string.disabled,

            updatableStringId = Settings.DISABLED_BY_ADMIN_SWITCH_SUMMARY,

            resId = R.string.disabled_by_admin,

            enforcedAdmin = enforcedAdmin,

packages/SettingsLib/SpaPrivileged/tests/unit/src/com/android/settingslib/spaprivileged/model/enterprise/RestrictedModeTest.kt

+6 −6
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ class RestrictedModeTest { 
            if (RestrictedLockUtilsInternal.isPolicyEnforcedByAdvancedProtection(context,

                    RESTRICTION, userId)) {

                return when (advancedProtectionStringId) {

                    R.string.enabled_by_advanced_protection -> ENABLED_BY_ADVANCED_PROTECTION

                    R.string.disabled_by_advanced_protection -> DISABLED_BY_ADVANCED_PROTECTION

                    com.android.settingslib.R.string.enabled -> ENABLED

                    com.android.settingslib.R.string.disabled -> DISABLED

                    else -> ""

                }

            }
@@ -129,7 +129,7 @@ class RestrictedModeTest { 


        val summary = blockedByAdmin.getSummary(true)



        assertThat(summary).isEqualTo(ENABLED_BY_ADVANCED_PROTECTION)

        assertThat(summary).isEqualTo(ENABLED)

    }



    @RequiresFlagsEnabled(Flags.FLAG_AAPM_API)
@@ -148,7 +148,7 @@ class RestrictedModeTest { 


        val summary = blockedByAdmin.getSummary(false)



        assertThat(summary).isEqualTo(DISABLED_BY_ADVANCED_PROTECTION)

        assertThat(summary).isEqualTo(DISABLED)

    }



    @RequiresFlagsEnabled(Flags.FLAG_AAPM_API)
@@ -202,7 +202,7 @@ class RestrictedModeTest { 


        const val ENABLED_BY_ADMIN = "Enabled by admin"

        const val DISABLED_BY_ADMIN = "Disabled by admin"

        const val ENABLED_BY_ADVANCED_PROTECTION = "Enabled by advanced protection"

        const val DISABLED_BY_ADVANCED_PROTECTION = "Disabled by advanced protection"

        const val ENABLED = "Enabled"

        const val DISABLED = "Disabled"

    }

}

packages/SettingsLib/SpaPrivileged/tests/unit/src/com/android/settingslib/spaprivileged/template/app/TogglePermissionAppListPageTest.kt

+1 −7
Original line number Diff line number Diff line
@@ -175,13 +175,7 @@ class TogglePermissionAppListPageTest { 


        val summary = getSummary(listModel)



        assertThat(summary)

            .isEqualTo(

                context.getString(

                    com.android.settingslib.widget.restricted.R.string

                        .disabled_by_advanced_protection

                )

            )

        assertThat(summary).isEqualTo(context.getString(com.android.settingslib.R.string.disabled))

    }



    @RequiresFlagsEnabled(Flags.FLAG_AAPM_API)

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1263,6 +1263,8 @@ 


    <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->

    <string name="disabled">Disabled</string>

    <!-- Summary for a settings preference indicating it is enabled [CHAR LIMIT = 30] -->

    <string name="enabled">Enabled</string>

    <!-- Summary of app trusted to install apps [CHAR LIMIT=45] -->

    <string name="external_source_trusted">Allowed</string>

    <!-- Summary of app not trusted to install apps [CHAR LIMIT=45] -->