Show split screen dialog on the introduction and enrolling page.
Revert ag/22361082 and ag/22460413, show the split screen dialog on the introduction and enrolling page, instead of relying on the callers to show the dialog. Test: atest BiometricsSplitScreenDialogTest Test: atest FaceEnrollIntroductionTest Test: atest SetupFingerprintEnrollIntroductionTest Bug: 299573056 Change-Id: Ieb106a4a623ad5ca0e6eb1633413df75767bef52
This commit is contained in:
@@ -0,0 +1,126 @@
|
||||
/*
|
||||
* Copyright (C) 2024 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.biometrics;
|
||||
|
||||
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;
|
||||
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.DialogInterface;
|
||||
import android.hardware.biometrics.BiometricAuthenticator;
|
||||
import android.os.Looper;
|
||||
import android.widget.Button;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.Shadows;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowAlertDialogCompat.class)
|
||||
public class BiometricsSplitScreenDialogTest {
|
||||
@Rule
|
||||
public final MockitoRule mocks = MockitoJUnit.rule();
|
||||
private FragmentActivity mActivity;
|
||||
private BiometricsSplitScreenDialog mFragment;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
ShadowAlertDialogCompat.reset();
|
||||
mActivity = Robolectric.buildActivity(FragmentActivity.class).setup().get();
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
ShadowAlertDialogCompat.reset();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testTexts_face() {
|
||||
final AlertDialog dialog = setUpFragment(TYPE_FACE, false /*destroyActivity*/);
|
||||
|
||||
final ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(dialog);
|
||||
assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(
|
||||
mActivity.getString(R.string.biometric_settings_add_face_in_split_mode_title));
|
||||
assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(
|
||||
mActivity.getString(R.string.biometric_settings_add_face_in_split_mode_message));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testTexts_fingerprint() {
|
||||
final AlertDialog dialog = setUpFragment(TYPE_FINGERPRINT, false /*destroyActivity*/);
|
||||
|
||||
final ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(dialog);
|
||||
assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(
|
||||
mActivity.getString(
|
||||
R.string.biometric_settings_add_fingerprint_in_split_mode_title));
|
||||
assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(
|
||||
mActivity.getString(
|
||||
R.string.biometric_settings_add_fingerprint_in_split_mode_message));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testButton_destroyActivity() {
|
||||
final AlertDialog dialog = setUpFragment(TYPE_FACE, true /*destroyActivity*/);
|
||||
final Button button = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
|
||||
|
||||
assertThat(button).isNotNull();
|
||||
button.performClick();
|
||||
Shadows.shadowOf(Looper.getMainLooper()).idle();
|
||||
|
||||
assertThat(dialog.isShowing()).isFalse();
|
||||
assertThat(mActivity.isFinishing()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testButton_notDestroyActivity() {
|
||||
final AlertDialog dialog = setUpFragment(TYPE_FACE, false /*destroyActivity*/);
|
||||
final Button button = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
|
||||
|
||||
assertThat(button).isNotNull();
|
||||
button.performClick();
|
||||
Shadows.shadowOf(Looper.getMainLooper()).idle();
|
||||
|
||||
assertThat(dialog.isShowing()).isFalse();
|
||||
assertThat(mActivity.isFinishing()).isFalse();
|
||||
}
|
||||
|
||||
private AlertDialog setUpFragment(
|
||||
@BiometricAuthenticator.Modality int biometricsModality, boolean destroyActivity) {
|
||||
mFragment = BiometricsSplitScreenDialog.newInstance(biometricsModality, destroyActivity);
|
||||
mFragment.show(mActivity.getSupportFragmentManager(), null);
|
||||
Shadows.shadowOf(Looper.getMainLooper()).idle();
|
||||
|
||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
assertThat(dialog).isNotNull();
|
||||
return dialog;
|
||||
}
|
||||
}
|
@@ -16,8 +16,6 @@
|
||||
|
||||
package com.android.settings.biometrics.combination;
|
||||
|
||||
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
|
||||
|
||||
import static com.android.settings.biometrics.combination.BiometricsSettingsBase.CONFIRM_REQUEST;
|
||||
import static com.android.settings.password.ChooseLockPattern.RESULT_FINISHED;
|
||||
|
||||
@@ -26,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doAnswer;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
@@ -37,11 +34,8 @@ import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.hardware.biometrics.ComponentInfoInternal;
|
||||
import android.hardware.biometrics.SensorProperties;
|
||||
import android.hardware.face.FaceManager;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
|
||||
import android.os.Bundle;
|
||||
import android.util.AndroidRuntimeException;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -52,15 +46,12 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.XmlRes;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.biometrics.BiometricStatusPreferenceController;
|
||||
import com.android.settings.biometrics.BiometricsSplitScreenDialog;
|
||||
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
|
||||
import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
|
||||
import com.android.settings.password.ChooseLockSettingsHelper;
|
||||
@@ -72,7 +63,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -112,8 +102,6 @@ public class CombinedBiometricProfileSettingsTest {
|
||||
private FaceStatusPreferenceController mFaceStatusPreferenceController;
|
||||
@Mock
|
||||
private FaceManager mFaceManager;
|
||||
@Mock
|
||||
private FragmentTransaction mFragmentTransaction;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
@@ -350,133 +338,6 @@ public class CombinedBiometricProfileSettingsTest {
|
||||
assertThat(capturedPreferences.get(0).getKey()).isEqualTo(mFragment.getFacePreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFingerprintUnlock_inMultiWindow_withoutEnrolledFp_showsDialog() {
|
||||
testClickFingerprintUnlock(true /* isInMultiWindow */, false /* hasEnrolledFingerprint */);
|
||||
verifyShowsDialogAfterClickingUnlock(mFragment.getFingerprintPreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFingerprintUnlock_inMultiWindow_withEnrolledFp_noDialog() {
|
||||
testClickFingerprintUnlock(true /* isInMultiWindow */, true /* hasEnrolledFingerprint */);
|
||||
verifyNoDialogAfterClickingUnlock(mFragment.getFingerprintPreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFingerprintUnlock_inFullScreen_withoutEnrolledFp_noDialog() {
|
||||
testClickFingerprintUnlock(false /* isInMultiWindow */, false /* hasEnrolledFingerprint */);
|
||||
verifyNoDialogAfterClickingUnlock(mFragment.getFingerprintPreferenceKey());
|
||||
}
|
||||
|
||||
private void testClickFingerprintUnlock(boolean isInMultiWindow,
|
||||
boolean hasEnrolledFingerprint) {
|
||||
final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
|
||||
props.add(new FingerprintSensorPropertiesInternal(
|
||||
0 /* sensorId */,
|
||||
SensorProperties.STRENGTH_STRONG,
|
||||
1 /* maxEnrollmentsPerUser */,
|
||||
new ArrayList<ComponentInfoInternal>(),
|
||||
TYPE_UDFPS_OPTICAL,
|
||||
true /* resetLockoutRequiresHardwareAuthToken */));
|
||||
doReturn(props).when(mFingerprintManager).getSensorPropertiesInternal();
|
||||
|
||||
doAnswer(invocation -> {
|
||||
final FingerprintManager.GenerateChallengeCallback callback =
|
||||
invocation.getArgument(1);
|
||||
callback.onChallengeGenerated(0, 0, 1L);
|
||||
return null;
|
||||
}).when(mFingerprintManager).generateChallenge(anyInt(), any());
|
||||
doReturn(new byte[]{1}).when(mFragment).requestGatekeeperHat(any(), anyLong(), anyInt(),
|
||||
anyLong());
|
||||
FragmentManager fragmentManager = mock(FragmentManager.class);
|
||||
doReturn(fragmentManager).when(mActivity).getSupportFragmentManager();
|
||||
doReturn(mFragmentTransaction).when(fragmentManager).beginTransaction();
|
||||
doReturn(isInMultiWindow).when(mActivity).isInMultiWindowMode();
|
||||
doReturn(hasEnrolledFingerprint).when(mFingerprintManager).hasEnrolledFingerprints(
|
||||
anyInt());
|
||||
|
||||
// Start fragment
|
||||
mFragment.onAttach(mContext);
|
||||
mFragment.onCreate(null);
|
||||
mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
|
||||
mFragment.onResume();
|
||||
|
||||
// User clicks on "Fingerprint Unlock"
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey(mFragment.getFingerprintPreferenceKey());
|
||||
mFragment.onPreferenceTreeClick(preference);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("b/295325503")
|
||||
public void testClickFaceUnlock_inMultiWindow_withoutEnrolledFp_showsDialog() {
|
||||
testClickFaceUnlock(true /* isInMultiWindow */, false /*hasEnrolledFace*/);
|
||||
verifyShowsDialogAfterClickingUnlock(mFragment.getFacePreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFaceUnlock_inMultiWindow_withEnrolledFp_noDialog() {
|
||||
testClickFaceUnlock(true /* isInMultiWindow */, true /* hasEnrolledFace */);
|
||||
verifyNoDialogAfterClickingUnlock(mFragment.getFacePreferenceKey());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testClickFaceUnlock_inFullScreen_withoutEnrolledFp_noDialog() {
|
||||
testClickFaceUnlock(false /* isInMultiWindow */ , false /* hasEnrolledFace */);
|
||||
verifyNoDialogAfterClickingUnlock(mFragment.getFacePreferenceKey());
|
||||
}
|
||||
|
||||
private void testClickFaceUnlock(boolean isInMultiWindow, boolean hasEnrolledFace) {
|
||||
doAnswer(invocation -> {
|
||||
final FaceManager.GenerateChallengeCallback callback =
|
||||
invocation.getArgument(1);
|
||||
callback.onGenerateChallengeResult(0, 0, 1L);
|
||||
return null;
|
||||
}).when(mFaceManager).generateChallenge(anyInt(), any());
|
||||
doReturn(new byte[] { 1 }).when(mFragment).requestGatekeeperHat(any(), anyLong(), anyInt(),
|
||||
anyLong());
|
||||
FragmentManager fragmentManager = mock(FragmentManager.class);
|
||||
doReturn(fragmentManager).when(mActivity).getSupportFragmentManager();
|
||||
doReturn(mFragmentTransaction).when(fragmentManager).beginTransaction();
|
||||
doReturn(isInMultiWindow).when(mActivity).isInMultiWindowMode();
|
||||
doReturn(hasEnrolledFace).when(mFaceManager).hasEnrolledTemplates(
|
||||
anyInt());
|
||||
|
||||
// Start fragment
|
||||
mFragment.onAttach(mContext);
|
||||
mFragment.onCreate(null);
|
||||
mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
|
||||
mFragment.onResume();
|
||||
|
||||
// User clicks on "Face Unlock"
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey(mFragment.getFacePreferenceKey());
|
||||
mFragment.onPreferenceTreeClick(preference);
|
||||
}
|
||||
|
||||
private void verifyNoDialogAfterClickingUnlock(String preferenceKey) {
|
||||
final BiometricStatusPreferenceController controller =
|
||||
preferenceKey.equals(mFragment.getFacePreferenceKey())
|
||||
? mFaceStatusPreferenceController
|
||||
: mFingerprintStatusPreferenceController;
|
||||
verify(controller).handlePreferenceTreeClick(mPreferenceCaptor.capture());
|
||||
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
|
||||
assertThat(capturedPreferences).hasSize(1);
|
||||
assertThat(capturedPreferences.get(0).getKey()).isEqualTo(preferenceKey);
|
||||
verify(mFragmentTransaction, never()).add(any(),
|
||||
eq(BiometricsSplitScreenDialog.class.getName()));
|
||||
}
|
||||
|
||||
private void verifyShowsDialogAfterClickingUnlock(String preferenceKey) {
|
||||
final BiometricStatusPreferenceController controller =
|
||||
preferenceKey.equals(mFragment.getFacePreferenceKey())
|
||||
? mFaceStatusPreferenceController
|
||||
: mFingerprintStatusPreferenceController;
|
||||
verify(controller, never()).handlePreferenceTreeClick(any());
|
||||
verify(mFragmentTransaction).add(any(),
|
||||
eq(BiometricsSplitScreenDialog.class.getName()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNoCrashIfDetachActivityDuringGeneratingChallengeThroughFaceManager() {
|
||||
doAnswer(invocation -> {
|
||||
|
@@ -38,6 +38,7 @@ import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
@@ -46,12 +47,15 @@ import android.hardware.face.FaceManager;
|
||||
import android.hardware.face.FaceSensorProperties;
|
||||
import android.hardware.face.FaceSensorPropertiesInternal;
|
||||
import android.hardware.face.IFaceAuthenticatorsRegisteredCallback;
|
||||
import android.os.Looper;
|
||||
import android.os.UserHandle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.internal.widget.LockPatternUtils;
|
||||
@@ -62,6 +66,7 @@ import com.android.settings.biometrics.BiometricUtils;
|
||||
import com.android.settings.password.ChooseLockSettingsHelper;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
|
||||
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
|
||||
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
|
||||
import com.android.settings.testutils.shadow.ShadowSensorPrivacyManager;
|
||||
@@ -101,7 +106,8 @@ import java.util.List;
|
||||
ShadowUtils.class,
|
||||
ShadowDevicePolicyManager.class,
|
||||
ShadowSensorPrivacyManager.class,
|
||||
SettingsShadowResources.class
|
||||
SettingsShadowResources.class,
|
||||
ShadowAlertDialogCompat.class
|
||||
})
|
||||
public class FaceEnrollIntroductionTest {
|
||||
|
||||
@@ -123,8 +129,8 @@ public class FaceEnrollIntroductionTest {
|
||||
enum GateKeeperAction {CALL_SUPER, RETURN_BYTE_ARRAY, THROW_CREDENTIAL_NOT_MATCH}
|
||||
|
||||
public static class TestFaceEnrollIntroduction extends FaceEnrollIntroduction {
|
||||
|
||||
private int mRecreateCount = 0;
|
||||
public boolean mIsMultiWindowMode;
|
||||
|
||||
public int getRecreateCount() {
|
||||
return mRecreateCount;
|
||||
@@ -161,6 +167,11 @@ public class FaceEnrollIntroductionTest {
|
||||
protected boolean launchPostureGuidance() {
|
||||
return super.launchPostureGuidance();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInMultiWindowMode() {
|
||||
return mIsMultiWindowMode;
|
||||
}
|
||||
}
|
||||
|
||||
@Before
|
||||
@@ -178,6 +189,7 @@ public class FaceEnrollIntroductionTest {
|
||||
public void tearDown() {
|
||||
ShadowUtils.reset();
|
||||
ShadowLockPatternUtils.reset();
|
||||
ShadowAlertDialogCompat.reset();
|
||||
}
|
||||
|
||||
private void setupActivity() {
|
||||
@@ -596,4 +608,37 @@ public class FaceEnrollIntroductionTest {
|
||||
assertThat(result).isEqualTo(0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void multiWindow_showsDialog() {
|
||||
mController = Robolectric.buildActivity(TestFaceEnrollIntroduction.class);
|
||||
mActivity = (TestFaceEnrollIntroduction) mController.get();
|
||||
mActivity.mIsMultiWindowMode = true;
|
||||
mController.setup().get();
|
||||
|
||||
Shadows.shadowOf(Looper.getMainLooper()).idle();
|
||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
assertThat(dialog).isNotNull();
|
||||
|
||||
final ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(dialog);
|
||||
assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(
|
||||
mActivity.getString(R.string.biometric_settings_add_face_in_split_mode_title));
|
||||
assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(
|
||||
mActivity.getString(R.string.biometric_settings_add_face_in_split_mode_message));
|
||||
|
||||
final Button button = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
|
||||
assertThat(button).isNotNull();
|
||||
button.performClick();
|
||||
Shadows.shadowOf(Looper.getMainLooper()).idle();
|
||||
assertThat(dialog.isShowing()).isFalse();
|
||||
assertThat(mActivity.isFinishing()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void singleWindow_noDialog() {
|
||||
Robolectric.buildActivity(TestFaceEnrollIntroduction.class).setup().get();
|
||||
Shadows.shadowOf(Looper.getMainLooper()).idle();
|
||||
|
||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
assertThat(dialog).isNull();
|
||||
}
|
||||
}
|
||||
|
@@ -20,9 +20,7 @@ import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWE
|
||||
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
|
||||
|
||||
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
|
||||
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.ADD_FINGERPRINT_REQUEST;
|
||||
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.CHOOSE_LOCK_GENERIC_REQUEST;
|
||||
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.KEY_FINGERPRINT_ADD;
|
||||
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.KEY_REQUIRE_SCREEN_ON_TO_AUTH;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
@@ -34,9 +32,7 @@ import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -57,10 +53,8 @@ import android.view.ViewGroup;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.biometrics.BiometricsSplitScreenDialog;
|
||||
import com.android.settings.password.ChooseLockSettingsHelper;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.ShadowFragment;
|
||||
@@ -132,35 +126,6 @@ public class FingerprintSettingsFragmentTest {
|
||||
ShadowUtils.reset();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddFingerprint_inFullScreen_noDialog() {
|
||||
setUpFragment(false);
|
||||
// Click "Add Fingerprint"
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey(KEY_FINGERPRINT_ADD);
|
||||
mFragment.onPreferenceTreeClick(preference);
|
||||
|
||||
verify(mFragment).startActivityForResult(any(), eq(ADD_FINGERPRINT_REQUEST));
|
||||
verify(mFragmentTransaction, never()).add(any(),
|
||||
eq(BiometricsSplitScreenDialog.class.getName()));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddFingerprint_inMultiWindow_showsDialog() {
|
||||
setUpFragment(false);
|
||||
|
||||
doReturn(true).when(mActivity).isInMultiWindowMode();
|
||||
|
||||
// Click "Add Fingerprint"
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setKey(KEY_FINGERPRINT_ADD);
|
||||
mFragment.onPreferenceTreeClick(preference);
|
||||
|
||||
verify(mFragment, times(0)).startActivityForResult(any(), eq(ADD_FINGERPRINT_REQUEST));
|
||||
verify(mFragmentTransaction).add(any(), eq(BiometricsSplitScreenDialog.class.getName()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testChooseLockKeyForFingerprint() {
|
||||
setUpFragment(true);
|
||||
|
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertWithMessage;
|
||||
|
||||
import static org.robolectric.RuntimeEnvironment.application;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.KeyguardManager;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
@@ -28,14 +29,18 @@ import android.hardware.biometrics.ComponentInfoInternal;
|
||||
import android.hardware.biometrics.SensorProperties;
|
||||
import android.hardware.fingerprint.FingerprintSensorProperties;
|
||||
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
|
||||
import android.os.Looper;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.biometrics.BiometricEnrollBase;
|
||||
import com.android.settings.biometrics.BiometricEnrollIntroduction;
|
||||
import com.android.settings.password.SetupSkipDialog;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
|
||||
import com.android.settings.testutils.shadow.ShadowFingerprintManager;
|
||||
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
|
||||
import com.android.settings.testutils.shadow.ShadowStorageManager;
|
||||
@@ -66,12 +71,23 @@ import java.util.List;
|
||||
ShadowFingerprintManager.class,
|
||||
ShadowLockPatternUtils.class,
|
||||
ShadowStorageManager.class,
|
||||
ShadowUserManager.class
|
||||
ShadowUserManager.class,
|
||||
ShadowAlertDialogCompat.class
|
||||
})
|
||||
public class SetupFingerprintEnrollIntroductionTest {
|
||||
|
||||
private ActivityController<SetupFingerprintEnrollIntroduction> mController;
|
||||
|
||||
public static class TestSetupFingerprintEnrollIntroductionInMultiWindowMode
|
||||
extends SetupFingerprintEnrollIntroduction {
|
||||
public boolean mIsMultiWindowMode = true;
|
||||
|
||||
@Override
|
||||
public boolean isInMultiWindowMode() {
|
||||
return mIsMultiWindowMode;
|
||||
}
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
Shadows.shadowOf(application.getPackageManager())
|
||||
@@ -105,6 +121,36 @@ public class SetupFingerprintEnrollIntroductionTest {
|
||||
@After
|
||||
public void tearDown() {
|
||||
ShadowStorageManager.reset();
|
||||
ShadowAlertDialogCompat.reset();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void multiWindow_showsDialog() {
|
||||
Activity activity = Robolectric.buildActivity(
|
||||
TestSetupFingerprintEnrollIntroductionInMultiWindowMode.class).setup().get();
|
||||
Shadows.shadowOf(Looper.getMainLooper()).idle();
|
||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
assertThat(dialog).isNotNull();
|
||||
|
||||
final ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(dialog);
|
||||
assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(
|
||||
activity.getString(
|
||||
R.string.biometric_settings_add_fingerprint_in_split_mode_title));
|
||||
assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(
|
||||
activity.getString(
|
||||
R.string.biometric_settings_add_fingerprint_in_split_mode_message));
|
||||
|
||||
// TODO(b/299573056): Make WizardManagerHelper.isAnySetupWizard(getIntent()) correct and
|
||||
// test button click not finishing the activity.
|
||||
}
|
||||
|
||||
@Test
|
||||
public void singleWindow_noDialog() {
|
||||
Robolectric.buildActivity(SetupFingerprintEnrollIntroduction.class).setup().get();
|
||||
Shadows.shadowOf(Looper.getMainLooper()).idle();
|
||||
|
||||
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
assertThat(dialog).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Reference in New Issue
Block a user