Merge "Fix fingerprint enrolling in settings show heavy theme" into qt-dev

am: 57ac23b2e5

Change-Id: I8fa351eb810616c189ee412dab1832c8afe0e6d2
This commit is contained in:
Pasty Chang
2019-05-23 23:13:24 -07:00
committed by android-build-merger

View File

@@ -138,7 +138,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar); mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar);
mVibrator = getSystemService(Vibrator.class); mVibrator = getSystemService(Vibrator.class);
DescriptionStyler.applyPartnerCustomizationStyle(mRepeatMessage); if (getLayout().shouldApplyPartnerHeavyThemeResource()) {
DescriptionStyler.applyPartnerCustomizationStyle(mRepeatMessage);
}
mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
mFooterBarMixin.setSecondaryButton( mFooterBarMixin.setSecondaryButton(
new FooterButton.Builder(this) new FooterButton.Builder(this)