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 
am: 30fb053

* commit '30fb0534492478a3f95f6953b31bbb666ced8fe5':
  Change default work challenge background color

Change-Id: Ib9b90a9d84c0502d37fc5b53ef4c83e830a8a822
This commit is contained in:
Clara Bayarri
2016-03-30 16:24:03 +00:00
committed by android-build-merger
parent 41eb41b05b 30fb053449
commit 3fcd1e74f4
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
* 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}.

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 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