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

Commit 30fb0534 authored by Clara Bayarri's avatar Clara Bayarri Committed by Android (Google) Code Review
Browse files

Merge "Change default work challenge background color" into nyc-dev

parents 1ed1bb0f 8d0bd7fa

core/java/android/app/admin/DevicePolicyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -5917,7 +5917,7 @@ public class DevicePolicyManager { 
    /**

     * Called by a profile owner of a managed profile to set the color used for customization. This

     * color is used as background color of the confirm credentials screen for that user. The

     * default color is {@link android.graphics.Color#GRAY}.

     * default color is teal (#00796B).

     * <p>

     * The confirm credentials screen can be created using

     * {@link android.app.KeyguardManager#createConfirmDeviceCredentialIntent}.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -654,8 +654,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        String shortSupportMessage = null;

        String longSupportMessage = null;



        // Background color of confirm credentials screen. Default: gray.

        static final int DEF_ORGANIZATION_COLOR = Color.GRAY;

        // Background color of confirm credentials screen. Default: teal.

        static final int DEF_ORGANIZATION_COLOR = Color.parseColor("#00796B");

        int organizationColor = DEF_ORGANIZATION_COLOR;



        // Default title of confirm credentials screen