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

Commit 5e3fd696 authored by Hao Dong's avatar Hao Dong
Browse files

Hide "no thanks" button when enrollment completed. 

Test: atest FingerprintEnrollIntroductionTest
Bug: 262666155
Change-Id: I61549029f87e7bbee665f47d24f9a929ad8b4df1
parent f253dc39

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

+4 −1
Original line number Diff line number Diff line
@@ -222,7 +222,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 


                    // Show secondary button once scroll is completed.

                    if (!scrollNeeded) {

                        if (!enrollmentCompleted) {

                            getSecondaryFooterButton().setVisibility(View.VISIBLE);

                        }

                        mHasScrolledToBottom = true;

                    }

                });
@@ -242,6 +244,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
            mErrorText.setVisibility(View.VISIBLE);

            getNextButton().setText(getResources().getString(R.string.done));

            getNextButton().setVisibility(View.VISIBLE);

            getSecondaryFooterButton().setVisibility(View.INVISIBLE);

        }

    }

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

+20 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.hardware.fingerprint.FingerprintManager; 
import android.hardware.fingerprint.FingerprintSensorProperties;

import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;

import android.os.UserManager;

import android.view.View;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -54,7 +55,10 @@ import com.android.settings.R; 
import com.android.settings.biometrics.GatekeeperPasswordProvider;



import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.GlifLayout;

import com.google.android.setupdesign.template.RequireScrollMixin;



import org.junit.Assert;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -177,6 +181,14 @@ public class FingerprintEnrollIntroductionTest { 
        int result = mFingerprintEnrollIntroduction.checkMaxEnrolled();



        assertThat(result).isEqualTo(0);



        final RequireScrollMixin requireScrollMixin =

                ((GlifLayout) mFingerprintEnrollIntroduction.findViewById(

                        R.id.setup_wizard_layout)).getMixin(RequireScrollMixin.class);

        requireScrollMixin.getOnRequireScrollStateChangedListener().onRequireScrollStateChanged(

                false);

        Assert.assertEquals(View.VISIBLE,

                mFingerprintEnrollIntroduction.getSecondaryFooterButton().getVisibility());

    }



    @Test
@@ -192,6 +204,14 @@ public class FingerprintEnrollIntroductionTest { 
        int result = mFingerprintEnrollIntroduction.checkMaxEnrolled();



        assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max);



        final RequireScrollMixin requireScrollMixin =

                ((GlifLayout) mFingerprintEnrollIntroduction.findViewById(

                        R.id.setup_wizard_layout)).getMixin(RequireScrollMixin.class);

        requireScrollMixin.getOnRequireScrollStateChangedListener().onRequireScrollStateChanged(

                false);

        Assert.assertEquals(View.INVISIBLE,

                mFingerprintEnrollIntroduction.getSecondaryFooterButton().getVisibility());

    }



    @Test