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

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

Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e3 

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



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

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(getContext())

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

                    .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/SetupFingerprintEnrollFindSensorTest.java

+18 −5
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static org.robolectric.RuntimeEnvironment.application; 


import android.content.Intent;

import android.hardware.fingerprint.FingerprintManager;

import android.widget.Button;



import androidx.appcompat.app.AlertDialog;
@@ -66,6 +65,23 @@ public class SetupFingerprintEnrollFindSensorTest { 


    @Test

    public void fingerprintEnroll_showsAlert_whenClickingSkip() {

        final AlertDialog alertDialog = setupAlertDialog();

        final ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(

                alertDialog);

        final int titleRes = R.string.setup_fingerprint_enroll_skip_title;



        assertThat(application.getString(titleRes)).isEqualTo(shadowAlertDialog.getTitle());

    }



    @Test

    public void fingerprintEnroll_showsAlert_setSudTheme() {

        final AlertDialog alertDialog = setupAlertDialog();



        assertThat(alertDialog.getContext().getThemeResId()).isEqualTo(

                R.style.GlifV2ThemeAlertDialog);

    }



    private AlertDialog setupAlertDialog() {

        final Intent intent = new Intent()

                // Set the challenge token so the confirm screen will not be shown

                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
@@ -80,9 +96,6 @@ public class SetupFingerprintEnrollFindSensorTest { 
        final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        assertThat(alertDialog).isNotNull();



        final ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(

                alertDialog);

        final int titleRes = R.string.setup_fingerprint_enroll_skip_title;

        assertThat(application.getString(titleRes)).isEqualTo(shadowAlertDialog.getTitle());

        return alertDialog;

    }

}