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

9/n: Add work profile background, enable new dialog by default

Browse Source 
Test: manual

Bug: 123378871
Change-Id: I78d6a63747bdafc7282def1d415459543a9b92af
This commit is contained in:
Kevin Chyn
2019-09-11 16:08:37 -07:00
parent e9744e406e
commit ddd0433c7d
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java
View File

@@ -19,12 +19,16 @@ package com.android.systemui.biometrics;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.graphics.PixelFormat;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.hardware.biometrics.BiometricAuthenticator;
import android.os.Binder;
import android.os.Bundle;
import android.os.IBinder;
import android.os.UserManager;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -208,6 +212,17 @@ public class AuthContainerView extends LinearLayout
mBackgroundView = mContainerView.findViewById(R.id.background);
UserManager userManager = mContext.getSystemService(UserManager.class);
DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
if (userManager.isManagedProfile(mConfig.mUserId)) {
final Drawable image = getResources().getDrawable(R.drawable.work_challenge_background,
mContext.getTheme());
image.setColorFilter(dpm.getOrganizationColorForUser(mConfig.mUserId),
PorterDuff.Mode.DARKEN);
mBackgroundView.setScaleType(ImageView.ScaleType.CENTER_CROP);
mBackgroundView.setImageDrawable(image);
}
mBiometricView.setRequireConfirmation(mConfig.mRequireConfirmation);
mBiometricView.setPanelController(mPanelController);
mBiometricView.setBiometricPromptBundle(config.mBiometricPromptBundle);

6
packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
View File

@@ -46,8 +46,8 @@ import java.util.List;
*/
public class AuthController extends SystemUI implements CommandQueue.Callbacks,
AuthDialogCallback {
private static final String USE_NEW_DIALOG =
"com.android.systemui.biometrics.AuthController.USE_NEW_DIALOG";
private static final String DISABLE_NEW_DIALOG =
"com.android.systemui.biometrics.AuthController.DISABLE_NEW_DIALOG";
private static final String TAG = "BiometricPrompt/AuthController";
private static final boolean DEBUG = true;
@@ -317,7 +317,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks,
protected AuthDialog buildDialog(Bundle biometricPromptBundle, boolean requireConfirmation,
int userId, int type, String opPackageName, boolean skipIntro) {
if (Settings.Secure.getIntForUser(
mContext.getContentResolver(), USE_NEW_DIALOG, userId, 0) != 0) {
mContext.getContentResolver(), DISABLE_NEW_DIALOG, userId, 0) == 0) {
return new AuthContainerView.Builder(mContext)
.setCallback(this)
.setBiometricPromptBundle(biometricPromptBundle)