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

Commit d1bdc8d2 authored by Ayush Sharma's avatar Ayush Sharma Committed by Automerger Merge Worker
Browse files

Merge "Add string for set separate work lock link" into tm-dev am: 7e71b424... 

Merge "Add string for set separate work lock link" into tm-dev am: 7e71b424 am: d756f11f am: 2ae0d3d4

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



Change-Id: If4d532a75d090a5953e64b0cebb4846095f80dbc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a25103a2 2ae0d3d4

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

+6 −0
Original line number Diff line number Diff line
@@ -183,6 +183,12 @@ public final class DevicePolicyResources { 
            public static final String WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK =

                    PREFIX + "WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK";



            /**

             * Text shown on the CTA link shown to user to set a separate lock for work apps

             */

            public static final String WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK_ACTION =

                    PREFIX + "WORK_PROFILE_IT_ADMIN_CANT_RESET_SCREEN_LOCK_ACTION";



            /**

             * Message shown in screen lock picker for setting up a work profile screen lock

             */