From 2cb81f9a2b64ae7dcc533313274378d808c14330 Mon Sep 17 00:00:00 2001 From: pastychang Date: Thu, 23 May 2019 15:42:41 +0800 Subject: [PATCH] Fix fingerprint enrolling in settings show heavy theme The descrpiton textview of fingerprint enrolling page that launchs from settings shouldn't apply heavy theme. It must check the atrribute of heavy theme is true first, and then apply it. Bug: 132366547 Test: Manual Change-Id: Id52151b308fa80f84a67d132634a8e9c58291878 --- .../biometrics/fingerprint/FingerprintEnrollEnrolling.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 9b1230929ee..e92c967c8f5 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -138,7 +138,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar); mVibrator = getSystemService(Vibrator.class); - DescriptionStyler.applyPartnerCustomizationStyle(mRepeatMessage); + if (getLayout().shouldApplyPartnerHeavyThemeResource()) { + DescriptionStyler.applyPartnerCustomizationStyle(mRepeatMessage); + } mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin.setSecondaryButton( new FooterButton.Builder(this)