Merge "Mark translatable="false" for DevicePolicyManager.getDisallowedSystemApps xmls"
This commit is contained in:
committed by
Android (Google) Code Review
commit
0d64cd33ba
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user