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

Commit 5562485d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add separate category header string for clone accounts" into... 

Merge "Merge "Add separate category header string for clone accounts" into udc-dev am: db2f94de am: b9993999" into udc-d1-dev-plus-aosp
parents 60c16d73 971e30d2

core/java/android/app/admin/DevicePolicyResources.java

+13 −0
Original line number Diff line number Diff line
@@ -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.

             */

packages/SettingsLib/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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" />