diff options
author | 2018-01-08 18:34:38 +0000 | |
---|---|---|
committer | 2018-01-08 18:34:38 +0000 | |
commit | b0577b62524e02c7a4a38a9fe391afaabc4f8212 (patch) | |
tree | 08f6b32a6ca26ac0de5d2b609a7c3abcab8991ea | |
parent | edfc6f98e5570c814819c1f478637608a322d5d0 (diff) |
Mark translatable="false" for DevicePolicyManager.getDisallowedSystemApps xmls
Bug: 71570743
Test: Disallowed apps are still moved
Change-Id: I7b7019fdeca4d75da42a77f3d66e310a08ec38d1
12 files changed, 12 insertions, 12 deletions
diff --git a/core/res/res/values/disallowed_apps_managed_device.xml b/core/res/res/values/disallowed_apps_managed_device.xml index 8940b15ccabb..3fb9ba451b10 100644 --- a/core/res/res/values/disallowed_apps_managed_device.xml +++ b/core/res/res/values/disallowed_apps_managed_device.xml @@ -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> diff --git a/core/res/res/values/disallowed_apps_managed_profile.xml b/core/res/res/values/disallowed_apps_managed_profile.xml index e3a513f4f096..c3ea8ecb695d 100644 --- a/core/res/res/values/disallowed_apps_managed_profile.xml +++ b/core/res/res/values/disallowed_apps_managed_profile.xml @@ -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> diff --git a/core/res/res/values/disallowed_apps_managed_user.xml b/core/res/res/values/disallowed_apps_managed_user.xml index b7b645dc0780..e5b29afe840b 100644 --- a/core/res/res/values/disallowed_apps_managed_user.xml +++ b/core/res/res/values/disallowed_apps_managed_user.xml @@ -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> diff --git a/core/res/res/values/required_apps_managed_device.xml b/core/res/res/values/required_apps_managed_device.xml index 0ac706f51a70..40db9dfbcd2c 100644 --- a/core/res/res/values/required_apps_managed_device.xml +++ b/core/res/res/values/required_apps_managed_device.xml @@ -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> diff --git a/core/res/res/values/required_apps_managed_profile.xml b/core/res/res/values/required_apps_managed_profile.xml index a0b8492644ee..c6b37e810f1a 100644 --- a/core/res/res/values/required_apps_managed_profile.xml +++ b/core/res/res/values/required_apps_managed_profile.xml @@ -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> diff --git a/core/res/res/values/required_apps_managed_user.xml b/core/res/res/values/required_apps_managed_user.xml index e8fdb210805c..8800e5353776 100644 --- a/core/res/res/values/required_apps_managed_user.xml +++ b/core/res/res/values/required_apps_managed_user.xml @@ -19,7 +19,7 @@ <resources> <!-- A list of apps to be retained on the managed user. Takes precedence over the disallowed apps lists. --> - <string-array name="required_apps_managed_user"> + <string-array translatable="false" name="required_apps_managed_user"> <item>com.android.settings</item> <item>com.android.contacts</item> <item>com.android.dialer</item> diff --git a/core/res/res/values/vendor_disallowed_apps_managed_device.xml b/core/res/res/values/vendor_disallowed_apps_managed_device.xml index c826d27d371e..493cd60d005b 100644 --- a/core/res/res/values/vendor_disallowed_apps_managed_device.xml +++ b/core/res/res/values/vendor_disallowed_apps_managed_device.xml @@ -18,6 +18,6 @@ --> <resources> <!-- A list of apps to be removed from the managed device by a particular vendor. --> - <string-array name="vendor_disallowed_apps_managed_device"> + <string-array translatable="false" name="vendor_disallowed_apps_managed_device"> </string-array> </resources> diff --git a/core/res/res/values/vendor_disallowed_apps_managed_profile.xml b/core/res/res/values/vendor_disallowed_apps_managed_profile.xml index 5fcb2778b6bc..84cab5fb4a5f 100644 --- a/core/res/res/values/vendor_disallowed_apps_managed_profile.xml +++ b/core/res/res/values/vendor_disallowed_apps_managed_profile.xml @@ -18,6 +18,6 @@ --> <resources> <!-- A list of apps to be removed from the managed profile by a particular vendor. --> - <string-array name="vendor_disallowed_apps_managed_profile"> + <string-array translatable="false" name="vendor_disallowed_apps_managed_profile"> </string-array> </resources> diff --git a/core/res/res/values/vendor_disallowed_apps_managed_user.xml b/core/res/res/values/vendor_disallowed_apps_managed_user.xml index 3355d77aac6a..975bb5deb320 100644 --- a/core/res/res/values/vendor_disallowed_apps_managed_user.xml +++ b/core/res/res/values/vendor_disallowed_apps_managed_user.xml @@ -18,6 +18,6 @@ --> <resources> <!-- A list of apps to be removed from the managed user by a particular vendor. --> - <string-array name="vendor_disallowed_apps_managed_user"> + <string-array translatable="false" name="vendor_disallowed_apps_managed_user"> </string-array> </resources> diff --git a/core/res/res/values/vendor_required_apps_managed_device.xml b/core/res/res/values/vendor_required_apps_managed_device.xml index e684e22d8599..1ef48db26491 100644 --- a/core/res/res/values/vendor_required_apps_managed_device.xml +++ b/core/res/res/values/vendor_required_apps_managed_device.xml @@ -19,6 +19,6 @@ <resources> <!-- A list of apps to be retained on the managed device by a particular vendor. Takes precedence over the disallowed apps lists. --> - <string-array name="vendor_required_apps_managed_device"> + <string-array translatable="false" name="vendor_required_apps_managed_device"> </string-array> </resources> diff --git a/core/res/res/values/vendor_required_apps_managed_profile.xml b/core/res/res/values/vendor_required_apps_managed_profile.xml index 4a3edf80c6e7..49cfa8b388df 100644 --- a/core/res/res/values/vendor_required_apps_managed_profile.xml +++ b/core/res/res/values/vendor_required_apps_managed_profile.xml @@ -19,6 +19,6 @@ <resources> <!-- A list of apps to be retained in the managed profile by a particular vendor. Takes precedence over the disallowed apps lists. --> - <string-array name="vendor_required_apps_managed_profile"> + <string-array translatable="false" name="vendor_required_apps_managed_profile"> </string-array> </resources> diff --git a/core/res/res/values/vendor_required_apps_managed_user.xml b/core/res/res/values/vendor_required_apps_managed_user.xml index 71dbd62f963c..bad780374caf 100644 --- a/core/res/res/values/vendor_required_apps_managed_user.xml +++ b/core/res/res/values/vendor_required_apps_managed_user.xml @@ -19,6 +19,6 @@ <resources> <!-- A list of apps to be retained on the managed user by a particular vendor. Takes precedence over the disallowed apps lists. --> - <string-array name="vendor_required_apps_managed_user"> + <string-array translatable="false" name="vendor_required_apps_managed_user"> </string-array> </resources> |