PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "deprecated applyPartnerCustomizationStyle" am: 6a553f7214

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12682504

Change-Id: I5b03faf44ed6b881d13f4cc57001dd6e7f89e724
This commit is contained in:
Pihuei Wang
2020-09-25 07:26:46 +00:00
committed by Automerger Merge Worker
parent 83ab3536b8 6a553f7214
commit c486b724cd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -139,7 +139,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
mVibrator = getSystemService(Vibrator.class); mVibrator = getSystemService(Vibrator.class);
if (getLayout().shouldApplyPartnerHeavyThemeResource()) { if (getLayout().shouldApplyPartnerHeavyThemeResource()) {
DescriptionStyler.applyPartnerCustomizationStyle(mRepeatMessage); DescriptionStyler.applyPartnerCustomizationHeavyStyle(mRepeatMessage);
} else if (getLayout().shouldApplyPartnerResource()) {
DescriptionStyler.applyPartnerCustomizationLightStyle(mRepeatMessage);
} }
mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
mFooterBarMixin.setSecondaryButton( mFooterBarMixin.setSecondaryButton(