Merge "Apply stencil theme for description textview" into qt-dev am: 6746e15859

am: 1b4965583f

Change-Id: I40bc435b5fb582f4a8013d030cc40b99a520035c
This commit is contained in:
Pasty Chang
2019-05-23 01:34:21 -07:00
committed by android-build-merger

View File

@@ -49,6 +49,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton; import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupdesign.util.DescriptionStyler;
/** /**
* Activity which handles the actual enrolling for fingerprint. * Activity which handles the actual enrolling for fingerprint.
@@ -137,6 +138,7 @@ 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);
mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
mFooterBarMixin.setSecondaryButton( mFooterBarMixin.setSecondaryButton(
new FooterButton.Builder(this) new FooterButton.Builder(this)