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

Commit 0d64cd33 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mark translatable="false" for DevicePolicyManager.getDisallowedSystemApps xmls"

parents c131a929 b0577b62

core/res/res/values/disallowed_apps_managed_device.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
-->

<resources>

    <!-- A list of apps to be removed from the managed device. -->

    <string-array name="disallowed_apps_managed_device">

    <string-array translatable="false" name="disallowed_apps_managed_device">

    </string-array>

</resources>

core/res/res/values/disallowed_apps_managed_profile.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
-->

<resources>

    <!-- A list of apps to be removed from the managed profile. -->

    <string-array name="disallowed_apps_managed_profile">

    <string-array translatable="false" name="disallowed_apps_managed_profile">

    </string-array>

</resources>

core/res/res/values/disallowed_apps_managed_user.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
-->

<resources>

    <!-- A list of apps to be removed from the managed user. -->

    <string-array name="disallowed_apps_managed_user">

    <string-array translatable="false" name="disallowed_apps_managed_user">

    </string-array>

</resources>

core/res/res/values/required_apps_managed_device.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<resources>

    <!-- A list of apps to be retained on the managed device.

            Takes precedence over the disallowed apps lists. -->

    <string-array name="required_apps_managed_device">

    <string-array translatable="false" name="required_apps_managed_device">

        <item>com.android.settings</item>

        <item>com.android.contacts</item>

        <item>com.android.dialer</item>

core/res/res/values/required_apps_managed_profile.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<resources>

    <!-- A list of apps to be retained in the managed profile.

            Takes precedence over the disallowed apps lists. -->

    <string-array name="required_apps_managed_profile">

    <string-array translatable="false" name="required_apps_managed_profile">

        <item>com.android.contacts</item>

        <item>com.android.settings</item>

        <item>com.android.providers.downloads</item>