PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to use PromptInfo.setLogo()

Browse Source 
Bug: 341697368
Test: Manually verified on the device
Change-Id: Ie350ef4551367ce65b065f38e924f8ff93d16021
This commit is contained in:
Hao Dong
2024-06-07 20:21:49 +00:00
parent f567d19681
commit 96537caa6d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -23,6 +23,8 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_W
import static android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED; import static android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED;
import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
import static com.android.systemui.biometrics.Utils.toBitmap;
import android.app.Activity; import android.app.Activity;
import android.app.KeyguardManager; import android.app.KeyguardManager;
import android.app.RemoteLockscreenValidationSession; import android.app.RemoteLockscreenValidationSession;
@@ -35,6 +37,7 @@ import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.UserProperties; import android.content.pm.UserProperties;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import android.hardware.biometrics.BiometricConstants; import android.hardware.biometrics.BiometricConstants;
import android.hardware.biometrics.BiometricPrompt; import android.hardware.biometrics.BiometricPrompt;
@@ -215,9 +218,10 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
&& android.multiuser.Flags.usePrivateSpaceIconInBiometricPrompt() && android.multiuser.Flags.usePrivateSpaceIconInBiometricPrompt()
&& hasSetBiometricDialogAdvanced(mContext, getLaunchedFromUid()) && hasSetBiometricDialogAdvanced(mContext, getLaunchedFromUid())
) { ) {
int iconResId = intent.getIntExtra(CUSTOM_BIOMETRIC_PROMPT_LOGO_RES_ID_KEY, 0); final int iconResId = intent.getIntExtra(CUSTOM_BIOMETRIC_PROMPT_LOGO_RES_ID_KEY, 0);
final Bitmap iconBitmap = toBitmap(mContext.getDrawable(iconResId));
if (iconResId != 0) { if (iconResId != 0) {
promptInfo.setLogoRes(iconResId); promptInfo.setLogo(iconResId, iconBitmap);
} }
String logoDescription = intent.getStringExtra( String logoDescription = intent.getStringExtra(
CUSTOM_BIOMETRIC_PROMPT_LOGO_DESCRIPTION_KEY); CUSTOM_BIOMETRIC_PROMPT_LOGO_DESCRIPTION_KEY);