From 3c53dac81b2a583b3bbc0c637e1534cf93f16b2d Mon Sep 17 00:00:00 2001 From: Grace Cheng Date: Thu, 7 Jul 2022 01:31:35 +0000 Subject: [PATCH] Display screen protector string and icon in fingerprint enrollment only on relevant devices Sets screen protector string and icon visibility to visible on UDFPS, and non-visible on non-UDFPS devices Fixes: 230156966 Test: Navigate to fingerprint enrollment page to see string & icon are gone on side-FPS device Change-Id: I527fb0d944a7c8180297ad44efa3e9bba3012703 --- .../FingerprintEnrollIntroduction.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index b9e9dcc5149..8ce38453ceb 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -61,6 +61,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { @Nullable private FooterButton mSecondaryFooterButton; private DevicePolicyManager mDevicePolicyManager; + private boolean mCanAssumeUdfps; @Override protected void onCreate(Bundle savedInstanceState) { @@ -72,6 +73,10 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { } super.onCreate(savedInstanceState); + final FingerprintManager fingerprintManager = getSystemService(FingerprintManager.class); + final List props = + fingerprintManager.getSensorPropertiesInternal(); + mCanAssumeUdfps = props != null && props.size() == 1 && props.get(0).isAnyUdfpsType(); mDevicePolicyManager = getSystemService(DevicePolicyManager.class); @@ -79,11 +84,13 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { final ImageView iconDeviceLocked = findViewById(R.id.icon_device_locked); final ImageView iconTrashCan = findViewById(R.id.icon_trash_can); final ImageView iconInfo = findViewById(R.id.icon_info); + final ImageView iconShield = findViewById(R.id.icon_shield); final ImageView iconLink = findViewById(R.id.icon_link); iconFingerprint.getDrawable().setColorFilter(getIconColorFilter()); iconDeviceLocked.getDrawable().setColorFilter(getIconColorFilter()); iconTrashCan.getDrawable().setColorFilter(getIconColorFilter()); iconInfo.getDrawable().setColorFilter(getIconColorFilter()); + iconShield.getDrawable().setColorFilter(getIconColorFilter()); iconLink.getDrawable().setColorFilter(getIconColorFilter()); final TextView footerMessage2 = findViewById(R.id.footer_message_2); @@ -97,6 +104,14 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { footerMessage5.setText(getFooterMessage5()); footerMessage6.setText(getFooterMessage6()); + if (mCanAssumeUdfps) { + footerMessage6.setVisibility(View.VISIBLE); + iconShield.setVisibility(View.VISIBLE); + } else { + footerMessage6.setVisibility(View.GONE); + iconShield.setVisibility(View.GONE); + } + final TextView footerTitle1 = findViewById(R.id.footer_title_1); final TextView footerTitle2 = findViewById(R.id.footer_title_2); footerTitle1.setText(getFooterTitle1());