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

Commit 6b763d19 authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Do not override SUW Glif theme when onApplyThemeResource() callback"... 

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

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



Change-Id: I5a16ac472b0a08273d2410b39741675a6f998f51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba331be6 e5a4e38c

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+3 −4
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ import androidx.appcompat.app.AlertDialog; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.SetupWizardUtils;

import com.android.settings.biometrics.BiometricEnrollSidecar;

import com.android.settings.biometrics.BiometricUtils;

import com.android.settings.biometrics.BiometricsEnrollEnrolling;
@@ -216,9 +215,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 


    @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);

    }



    @Override
@@ -1058,7 +1056,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 


        @Override

        public Dialog onCreateDialog(Bundle savedInstanceState) {

            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(),

                    R.style.Theme_AlertDialog);

            builder.setTitle(R.string.security_settings_fingerprint_enroll_touch_dialog_title)

                    .setMessage(R.string.security_settings_fingerprint_enroll_touch_dialog_message)

                    .setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

+1 −3
Original line number Diff line number Diff line
@@ -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() {

src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso 


        @NonNull

        public AlertDialog.Builder onCreateDialogBuilder() {

            return new AlertDialog.Builder(getActivity())

            return new AlertDialog.Builder(getActivity(), R.style.Theme_AlertDialog)

                    .setTitle(R.string.setup_fingerprint_enroll_skip_title)

                    .setPositiveButton(R.string.skip_anyway_button_label, this)

                    .setNegativeButton(R.string.go_back_button_label, this)

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java

+6 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class FingerprintEnrollEnrollingTest { 


    @Mock private Display mMockDisplay;



    @Mock private Resources.Theme mTheme;

    private Resources.Theme mTheme;



    private final int[] mSfpsStageThresholds = new int[]{0, 9, 13, 19, 25};
@@ -242,7 +242,8 @@ public class FingerprintEnrollEnrollingTest { 


        mActivity.onApplyThemeResource(mTheme, R.style.GlifTheme, true /* first */);



        verify(mTheme).applyStyle(R.style.SetupWizardPartnerResource, true);

        final String appliedThemes = mTheme.toString();

        assertThat(appliedThemes.contains("SetupWizardPartnerResource")).isTrue();

    }



    @Test
@@ -251,7 +252,8 @@ public class FingerprintEnrollEnrollingTest { 


        mActivity.onApplyThemeResource(mTheme, R.style.GlifTheme, true /* first */);



        verify(mTheme).applyStyle(R.style.SetupWizardPartnerResource, true);

        final String appliedThemes = mTheme.toString();

        assertThat(appliedThemes.contains("SetupWizardPartnerResource")).isTrue();

    }



    private void initializeActivityFor(int sensorType) {
@@ -291,6 +293,7 @@ public class FingerprintEnrollEnrollingTest { 
        }



        ActivityController.of(mActivity).create(savedInstanceState);

        mTheme = mActivity.getTheme();

    }



    private EnrollmentCallback verifyAndCaptureEnrollmentCallback() {

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java

+4 −3
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ public class FingerprintEnrollFindSensorTest { 
    @Mock

    private FingerprintManager mFingerprintManager;



    @Mock

    private Resources.Theme mTheme;



    private ActivityController<FingerprintEnrollFindSensor> mActivityController;
@@ -104,6 +103,7 @@ public class FingerprintEnrollFindSensorTest { 
                        .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0])

        );

        mActivity = mActivityController.get();

        mTheme = mActivity.getTheme();

    }



    @Before
@@ -560,9 +560,10 @@ public class FingerprintEnrollFindSensorTest { 
        setupActivity_onSfpsDevice();

        verifySidecar_onRearOrSfpsDevice();



        mActivity.onApplyThemeResource(mActivity.getTheme(), R.style.GlifTheme, true /* first */);

        mActivity.onApplyThemeResource(mTheme, R.style.GlifTheme, true /* first */);



        verify(mTheme).applyStyle(R.style.SetupWizardPartnerResource, true);

        final String appliedThemes = mTheme.toString();

        assertThat(appliedThemes.contains("SetupWizardPartnerResource")).isTrue();

    }



    private void triggerEnrollProgressAndError_onRearDevice() {