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

Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev

Browse Source
This commit is contained in:
Bill Lin
2022-09-30 23:54:31 +00:00
committed by Android (Google) Code Review
parent e7722ef90c 39175b2f87
commit e5a4e38c8c
6 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@ import android.view.accessibility.AccessibilityManager;
import androidx.annotation.Nullable;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricEnrollSidecar;
@@ -216,9 +215,8 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
final int newResid = SetupWizardUtils.getTheme(this, getIntent());
theme.applyStyle(R.style.SetupWizardPartnerResource, true);
super.onApplyThemeResource(theme, newResid, first);
super.onApplyThemeResource(theme, resid, first);
}
protected int getContentView() {