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

Merge "Change SUW theme style for Fingerprint and Face enrollment flow (1/n)" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-10-30 14:56:21 +00:00
committed by Android (Google) Code Review
parent 01a374e499 005aafde24
commit 2fdca61ce4
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/biometrics/BiometricEnrollBase.java
View File

@@ -148,8 +148,16 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this);
if (ThemeHelper.shouldApplyGlifExpressiveStyle(getApplicationContext())) {
if (!ThemeHelper.trySetSuwTheme(this)) {
setTheme(ThemeHelper.getSuwDefaultTheme(getApplicationContext()));
ThemeHelper.trySetDynamicColor(this);
}
} else {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
ThemeHelper.trySetDynamicColor(this);
}
mChallenge = getIntent().getLongExtra(EXTRA_KEY_CHALLENGE, -1L);
mSensorId = getIntent().getIntExtra(EXTRA_KEY_SENSOR_ID, -1);
// Don't need to retrieve the HAT if it already exists. In some cases, the extras do not

15
src/com/android/settings/password/ConfirmLockPassword.java
View File

@@ -66,10 +66,13 @@ import com.android.internal.widget.LockscreenCredential;
import com.android.internal.widget.TextViewInputDisabler;
import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settingslib.animation.AppearAnimationUtils;
import com.android.settingslib.animation.DisappearAnimationUtils;
import com.google.android.setupdesign.util.ThemeHelper;
import java.util.ArrayList;
public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
@@ -85,6 +88,18 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
public static class InternalActivity extends ConfirmLockPassword {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (ThemeHelper.shouldApplyGlifExpressiveStyle(getApplicationContext())) {
if (!ThemeHelper.trySetSuwTheme(this)) {
setTheme(ThemeHelper.getSuwDefaultTheme(getApplicationContext()));
ThemeHelper.trySetDynamicColor(this);
}
}
}
@Override
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());