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

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

Browse Source
This commit is contained in:
Clara Bayarri
2016-03-30 16:12:59 +00:00
committed by Android (Google) Code Review
parent 1ed1bb0fc0 8d0bd7fa63
commit 30fb053449
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -5917,7 +5917,7 @@ public class DevicePolicyManager {
/** /**
* Called by a profile owner of a managed profile to set the color used for customization. This * 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 * 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> * <p>
* The confirm credentials screen can be created using * The confirm credentials screen can be created using
* {@link android.app.KeyguardManager#createConfirmDeviceCredentialIntent}. * {@link android.app.KeyguardManager#createConfirmDeviceCredentialIntent}.

4
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -654,8 +654,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
String shortSupportMessage = null; String shortSupportMessage = null;
String longSupportMessage = null; String longSupportMessage = null;
// Background color of confirm credentials screen. Default: gray. // Background color of confirm credentials screen. Default: teal.
static final int DEF_ORGANIZATION_COLOR = Color.GRAY; static final int DEF_ORGANIZATION_COLOR = Color.parseColor("#00796B");
int organizationColor = DEF_ORGANIZATION_COLOR; int organizationColor = DEF_ORGANIZATION_COLOR;
// Default title of confirm credentials screen // Default title of confirm credentials screen