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 am: db2f94de76

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22575267

Change-Id: I5b943781f68e3a1e3e73aa8f8a5769b484fd366e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jigar Thakkar
2023-05-10 13:40:45 +00:00
committed by Automerger Merge Worker
parent 202d599cfb db2f94de76
commit 94753d2499
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 =
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
*/
@@ -1171,6 +1177,13 @@ public final class DevicePolicyResources {
public static final String 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.
*/

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

@@ -516,6 +516,9 @@
<string name="category_personal">Personal</string>
<!-- Header for items under the work user [CHAR LIMIT=30] -->
<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] -->
<string name="oem_preferred_feedback_reporter" translatable="false" />