Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add separate category header string for clone accounts" into udc-dev

Browse Source
This commit is contained in:
Jigar Thakkar
2023-05-10 13:38:59 +00:00
committed by Android (Google) Code Review
parent d6c040c7b2 89eb10e346
commit db2f94de76
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/admin/DevicePolicyResources.java
View File

@@ -242,6 +242,12 @@ public final class DevicePolicyResources {
public static final String ACCESSIBILITY_CATEGORY_PERSONAL = public static final String ACCESSIBILITY_CATEGORY_PERSONAL =
PREFIX + "ACCESSIBILITY_CATEGORY_PERSONAL"; PREFIX + "ACCESSIBILITY_CATEGORY_PERSONAL";
/**
* Content description for clone profile accounts group
*/
public static final String ACCESSIBILITY_CATEGORY_CLONE =
PREFIX + "ACCESSIBILITY_CATEGORY_CLONE";
/** /**
* Content description for work profile details page title * Content description for work profile details page title
*/ */
@@ -1171,6 +1177,13 @@ public final class DevicePolicyResources {
public static final String PERSONAL_CATEGORY_HEADER = public static final String PERSONAL_CATEGORY_HEADER =
PREFIX + "PERSONAL_CATEGORY_HEADER"; PREFIX + "PERSONAL_CATEGORY_HEADER";
/**
* Header for items under the clone user
*/
public static final String CLONE_CATEGORY_HEADER =
PREFIX + "CLONE_CATEGORY_HEADER";
/** /**
* Text to indicate work notification content will be shown on the lockscreen. * Text to indicate work notification content will be shown on the lockscreen.
*/ */

3
packages/SettingsLib/res/values/strings.xml
View File

@@ -516,6 +516,9 @@
<string name="category_personal">Personal</string> <string name="category_personal">Personal</string>
<!-- Header for items under the work user [CHAR LIMIT=30] --> <!-- Header for items under the work user [CHAR LIMIT=30] -->
<string name="category_work">Work</string> <string name="category_work">Work</string>
<!-- Header for items under the clone user [CHAR LIMIT=30] -->
<string name="category_clone">Clone</string>
<!-- Full package name of OEM preferred device feedback reporter. Leave this blank, overlaid in Settings/TvSettings [DO NOT TRANSLATE] --> <!-- Full package name of OEM preferred device feedback reporter. Leave this blank, overlaid in Settings/TvSettings [DO NOT TRANSLATE] -->
<string name="oem_preferred_feedback_reporter" translatable="false" /> <string name="oem_preferred_feedback_reporter" translatable="false" />