Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fdca61c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 01a374e4 005aafde

src/com/android/settings/biometrics/BiometricEnrollBase.java

+10 −2
Original line number Diff line number Diff line
@@ -148,8 +148,16 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        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

src/com/android/settings/password/ConfirmLockPassword.java

+15 −0
Original line number Diff line number Diff line
@@ -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());