From 3f0864af1bf3a86c7ca03a81ed4a98caa882c4e5 Mon Sep 17 00:00:00 2001 From: chengfeitao Date: Thu, 22 Dec 2022 00:28:00 +0000 Subject: [PATCH] Better biometric subtitle with createConfirmDeviceCredentialIntent() API Test: Tested manually with repro steps Fixes: 224967328 Change-Id: I7e83392f5a2df3c258c07e77a9332b2cfde95225 --- .../settings/applications/appinfo/AppInfoDashboardFragment.java | 1 + src/com/android/settings/password/BiometricFragment.java | 1 + .../settings/password/ConfirmDeviceCredentialActivity.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index 4a00260822e..e7f23b2b126 100644 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -451,6 +451,7 @@ public class AppInfoDashboardFragment extends DashboardFragment }; final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(context) + .setUseDefaultSubtitle() // use default subtitle if subtitle is null/empty .setUseDefaultTitle(); // use default title if title is null/empty final BiometricManager bm = context.getSystemService(BiometricManager.class); diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java index e4c08e73ff8..d364c71b331 100644 --- a/src/com/android/settings/password/BiometricFragment.java +++ b/src/com/android/settings/password/BiometricFragment.java @@ -129,6 +129,7 @@ public class BiometricFragment extends InstrumentedFragment { mBiometricPrompt = new BiometricPrompt.Builder(getContext()) .setTitle(promptInfo.getTitle()) .setUseDefaultTitle() // use default title if title is null/empty + .setUseDefaultSubtitle() // use default subtitle if subtitle is null/empty .setDeviceCredentialAllowed(true) .setSubtitle(promptInfo.getSubtitle()) .setDescription(promptInfo.getDescription()) diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java index 3b5600f73a8..e56e86c4453 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java @@ -212,7 +212,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { getTitleFromCredentialType(credentialType, isEffectiveUserManagedProfile)); } if (mDetails == null) { - promptInfo.setSubtitle( + promptInfo.setDeviceCredentialSubtitle( getDetailsFromCredentialType(credentialType, isEffectiveUserManagedProfile)); }