Merge "[Biometric Onboarding & Edu] Update face settings page" into main

This commit is contained in:
Shawn Lin
2025-02-05 02:52:09 -08:00
committed by Android (Google) Code Review
14 changed files with 394 additions and 54 deletions

View File

@@ -32,6 +32,8 @@ import android.hardware.face.FaceSensorPropertiesInternal;
import android.hardware.face.IFaceAuthenticatorsRegisteredCallback;
import android.os.Looper;
import android.os.RemoteException;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
@@ -60,6 +62,8 @@ import java.util.List;
public class FaceSettingsFooterPreferenceControllerTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private static final String PREF_KEY = "security_face_footer";
@Mock
private FaceManager mFaceManager;
@@ -140,6 +144,7 @@ public class FaceSettingsFooterPreferenceControllerTest {
}
@Test
@DisableFlags(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)
public void testString_faceClass3() throws RemoteException {
setupHasFaceFeature();
displayFaceSettingsFooterPreferenceController();

View File

@@ -24,6 +24,7 @@ import static org.mockito.Mockito.verify;
import android.content.Context;
import android.widget.Button;
import androidx.preference.Preference;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before;
@@ -43,6 +44,8 @@ public class FaceSettingsEnrollButtonPreferenceControllerTest {
@Mock
private Button mButton;
@Mock
private Preference mPreference;
@Mock
private FaceSettingsEnrollButtonPreferenceController.Listener mListener;
private FaceSettingsEnrollButtonPreferenceController mController;
@@ -65,4 +68,12 @@ public class FaceSettingsEnrollButtonPreferenceControllerTest {
assertThat(mController.isClicked()).isTrue();
verify(mListener).onStartEnrolling(any());
}
@Test
public void testOnPreferenceClick() {
mController.onPreferenceClick(mPreference);
assertThat(mController.isClicked()).isTrue();
verify(mListener).onStartEnrolling(any());
}
}