diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 26f0c4fcabc..214d32a3c17 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -9,7 +9,7 @@ - + diff --git a/res/values/strings.xml b/res/values/strings.xml index c1a6dfeaca9..bd9cbbd2527 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5401,9 +5401,9 @@ Quickly access accessibility features - How to use the button or gesture\n\n1. Go to accessibility settings\n2. Select a feature and tap the shortcut\n3. To use the feature, tap the accessibility button or gesture + To get started\n1. Go to accessibility settings\n2. Select a feature and tap the shortcut\n3. Choose whether you want to use a button or gesture to access the feature - How to use the button\n\n1. Go to accessibility settings\n2. Select a feature and tap the shortcut\n3. To use the feature, tap the accessibility button + To get started\n1. Go to accessibility settings\n2. Select a feature and tap the shortcut\n3. Choose the button to use to access the feature Use button or gesture diff --git a/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java index 0ff960f23e5..930fbe4c9c7 100644 --- a/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizard.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.LayoutInflater; @@ -57,7 +58,7 @@ public class TextReadingPreferenceFragmentForSetupWizard extends TextReadingPref @Override public int getMetricsCategory() { - return super.getMetricsCategory(); + return SettingsEnums.SUW_ACCESSIBILITY_TEXT_READING_OPTIONS; } @Override diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 2ef5446dd31..23595fb91f9 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -35,6 +35,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; +import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollIntroduction; @@ -55,6 +56,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { private static final String TAG = "FingerprintIntro"; + @VisibleForTesting private FingerprintManager mFingerprintManager; @Nullable private FooterButton mPrimaryFooterButton; @Nullable private FooterButton mSecondaryFooterButton; @@ -213,6 +215,8 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { @Override protected int checkMaxEnrolled() { final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent()); + final boolean isDeferredSetupWizard = + WizardManagerHelper.isDeferredSetupWizard(getIntent()); if (mFingerprintManager != null) { final List props = mFingerprintManager.getSensorPropertiesInternal(); @@ -220,9 +224,11 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { final int max = props.get(0).maxEnrollmentsPerUser; final int numEnrolledFingerprints = mFingerprintManager.getEnrolledFingerprints(mUserId).size(); - final int maxFingerprintsEnrollableIfSUW = getApplicationContext().getResources() - .getInteger(R.integer.suw_max_fingerprints_enrollable); - if (isSetupWizard) { + final int maxFingerprintsEnrollableIfSUW = + getApplicationContext() + .getResources() + .getInteger(R.integer.suw_max_fingerprints_enrollable); + if (isSetupWizard && !isDeferredSetupWizard) { if (numEnrolledFingerprints >= maxFingerprintsEnrollableIfSUW) { return R.string.fingerprint_intro_error_max; } else { diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java index 9a157d6ea05..8fdc3700dd6 100644 --- a/src/com/android/settings/network/UiccSlotUtil.java +++ b/src/com/android/settings/network/UiccSlotUtil.java @@ -369,6 +369,7 @@ public class UiccSlotUtil { } return true; }) + .sorted(Comparator.comparingInt(UiccSlotMapping::getLogicalSlotIndex)) .mapToInt(uiccSlotMapping -> uiccSlotMapping.getLogicalSlotIndex()) .findFirst() .orElse(INVALID_LOGICAL_SLOT_ID); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java new file mode 100644 index 00000000000..d8852dbb739 --- /dev/null +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2022 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.fingerprint; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; +import android.hardware.biometrics.ComponentInfoInternal; +import android.hardware.biometrics.SensorProperties; +import android.hardware.fingerprint.Fingerprint; +import android.hardware.fingerprint.FingerprintManager; +import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; + +import com.android.settings.R; + +import com.google.android.setupcompat.util.WizardManagerHelper; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.android.controller.ActivityController; +import org.robolectric.util.ReflectionHelpers; + +import java.util.ArrayList; +import java.util.List; + +@RunWith(RobolectricTestRunner.class) +public class FingerprintEnrollIntroductionTest { + + @Mock private FingerprintManager mFingerprintManager; + + private Context mContext; + + private FingerprintEnrollIntroduction mFingerprintEnrollIntroduction; + + private static final int MAX_ENROLLMENTS = 5; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = spy(RuntimeEnvironment.application.getApplicationContext()); + + final List componentInfo = new ArrayList<>(); + final FingerprintSensorPropertiesInternal prop = + new FingerprintSensorPropertiesInternal( + 0 /* sensorId */, + SensorProperties.STRENGTH_STRONG, + MAX_ENROLLMENTS /* maxEnrollmentsPerUser */, + componentInfo, + FingerprintSensorProperties.TYPE_REAR, + true /* resetLockoutRequiresHardwareAuthToken */); + final ArrayList props = new ArrayList<>(); + props.add(prop); + when(mFingerprintManager.getSensorPropertiesInternal()).thenReturn(props); + } + + void setupFingerprintEnrollIntroWith(Intent intent) { + ActivityController controller = + Robolectric.buildActivity(FingerprintEnrollIntroduction.class, intent); + mFingerprintEnrollIntroduction = spy(controller.get()); + ReflectionHelpers.setField( + mFingerprintEnrollIntroduction, "mFingerprintManager", mFingerprintManager); + controller.create(); + } + + void setFingerprintManagerToHave(int numEnrollments) { + List fingerprints = new ArrayList<>(); + for (int i = 0; i < numEnrollments; i++) { + fingerprints.add( + new Fingerprint( + "Fingerprint " + i /* name */, 1 /*fingerId */, 1 /* deviceId */)); + } + when(mFingerprintManager.getEnrolledFingerprints(anyInt())).thenReturn(fingerprints); + } + + @Test + public void intro_CheckCanEnrollNormal() { + setupFingerprintEnrollIntroWith(new Intent()); + setFingerprintManagerToHave(3 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(0); + } + + @Test + public void intro_CheckMaxEnrolledNormal() { + setupFingerprintEnrollIntroWith(new Intent()); + setFingerprintManagerToHave(7 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); + } + + @Test + public void intro_CheckCanEnrollDuringSUW() { + // This code path should depend on suw_max_fingerprints_enrollable versus + // FingerprintManager.getSensorProperties...maxEnrollmentsPerUser() + Resources resources = mock(Resources.class); + when(resources.getInteger(anyInt())).thenReturn(5); + when(mContext.getResources()).thenReturn(resources); + + setupFingerprintEnrollIntroWith( + new Intent() + .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true) + .putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)); + setFingerprintManagerToHave(0 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(0); + } + + @Test + public void intro_CheckMaxEnrolledDuringSUW() { + // This code path should depend on suw_max_fingerprints_enrollable versus + // FingerprintManager.getSensorProperties...maxEnrollmentsPerUser() + Resources resources = mock(Resources.class); + when(mContext.getResources()).thenReturn(resources); + when(resources.getInteger(anyInt())).thenReturn(1); + + setupFingerprintEnrollIntroWith( + new Intent() + .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true) + .putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)); + setFingerprintManagerToHave(1 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); + } + + @Test + public void intro_CheckCanEnrollDuringDeferred() { + setupFingerprintEnrollIntroWith( + new Intent().putExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, true)); + setFingerprintManagerToHave(2 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(0); + } + + @Test + public void intro_CheckMaxEnrolledDuringDeferred() { + setupFingerprintEnrollIntroWith( + new Intent().putExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, true)); + setFingerprintManagerToHave(6 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); + } +} diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index a0188f8262b..3305cded8ad 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -23,26 +23,23 @@ import static org.mockito.Mockito.when; import android.content.Context; import androidx.preference.Preference; +import androidx.test.core.app.ApplicationProvider; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; @RunWith(RobolectricTestRunner.class) -@Ignore public class WhenToDreamPreferenceControllerTest { private WhenToDreamPreferenceController mController; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mContext; @Mock private DreamBackend mBackend; @@ -50,6 +47,7 @@ public class WhenToDreamPreferenceControllerTest { @Before public void setup() { MockitoAnnotations.initMocks(this); + mContext = ApplicationProvider.getApplicationContext(); mController = new WhenToDreamPreferenceController(mContext); ReflectionHelpers.setField(mController, "mBackend", mBackend); } diff --git a/tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java b/tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java index cc9bdfc62e0..2cf984558be 100644 --- a/tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java +++ b/tests/unit/src/com/android/settings/network/UiccSlotUtilTest.java @@ -454,7 +454,7 @@ public class UiccSlotUtilTest { @Test public void getExcludedLogicalSlotIndex_oneEsimAndFromDualPortsAToPsimAndPort0_logicalSlot1() { // There is only one enabled esimPort0 before user enables the psim. - Collection uiccSlotMappings = createUiccSlotMappingPsimAndPort1(); + Collection uiccSlotMappings = createUiccSlotMappingDualPortsA(); Collection activeSubscriptionInfoList = createActiveSubscriptionInfoListOneSim(0, 0); SubscriptionInfo removedSubInfo = null; @@ -469,7 +469,7 @@ public class UiccSlotUtilTest { @Test public void getExcludedLogicalSlotIndex_oneEsimAndFromDualPortsBToPsimAndPort1_logicalSlot1() { // There is only one enabled esimPort1 before user enables the psim. - Collection uiccSlotMappings = createUiccSlotMappingPsimAndPort1(); + Collection uiccSlotMappings = createUiccSlotMappingDualPortsB(); Collection activeSubscriptionInfoList = createActiveSubscriptionInfoListOneSim(0, 1); SubscriptionInfo removedSubInfo = null; @@ -484,7 +484,7 @@ public class UiccSlotUtilTest { @Test public void getExcludedLogicalSlotIndex_oneEsimAndFromDualPortsBToPsimAndPort0_logicalSlot0() { // There is only one enabled esimPort0 before user enables the psim. - Collection uiccSlotMappings = createUiccSlotMappingPsimAndPort1(); + Collection uiccSlotMappings = createUiccSlotMappingDualPortsB(); Collection activeSubscriptionInfoList = createActiveSubscriptionInfoListOneSim(1, 0); SubscriptionInfo removedSubInfo = null; @@ -552,6 +552,48 @@ public class UiccSlotUtilTest { assertThat(testExcludedLogicalSlotIndex).isEqualTo(verifyExcludedLogicalSlotIndex); } + @Test + public void getExcludedLogicalSlotIndex_noEsimAndFromDualPortsAToPsimAndPort1_logicalSlot0() { + // There is no profiles enabled on either esim port before user enables the psim. + Collection uiccSlotMappings = createUiccSlotMappingDualPortsA(); + Collection activeSubscriptionInfoList = new ArrayList<>(); + SubscriptionInfo removedSubInfo = null; + int verifyExcludedLogicalSlotIndex = 0; + + int testExcludedLogicalSlotIndex = UiccSlotUtil.getExcludedLogicalSlotIndex( + uiccSlotMappings, activeSubscriptionInfoList, removedSubInfo, true); + + assertThat(testExcludedLogicalSlotIndex).isEqualTo(verifyExcludedLogicalSlotIndex); + } + + @Test + public void getExcludedLogicalSlotIndex_noEsimAndFromDualPortsBToPsimAndPort0_logicalSlot0() { + // There is no profiles enabled on either esim port before user enables the psim. + Collection uiccSlotMappings = createUiccSlotMappingDualPortsB(); + Collection activeSubscriptionInfoList = new ArrayList<>(); + SubscriptionInfo removedSubInfo = null; + int verifyExcludedLogicalSlotIndex = 0; + + int testExcludedLogicalSlotIndex = UiccSlotUtil.getExcludedLogicalSlotIndex( + uiccSlotMappings, activeSubscriptionInfoList, removedSubInfo, true); + + assertThat(testExcludedLogicalSlotIndex).isEqualTo(verifyExcludedLogicalSlotIndex); + } + + @Test + public void getExcludedLogicalSlotIndex_noEsimNoOrdingFromDualPortsBToPsimAndPort1_logical0() { + // There is no profiles enabled on either esim port before user enables the psim. + Collection uiccSlotMappings = createUiccSlotMappingDualPortsBNoOrding(); + Collection activeSubscriptionInfoList = new ArrayList<>(); + SubscriptionInfo removedSubInfo = null; + int verifyExcludedLogicalSlotIndex = 0; + + int testExcludedLogicalSlotIndex = UiccSlotUtil.getExcludedLogicalSlotIndex( + uiccSlotMappings, activeSubscriptionInfoList, removedSubInfo, true); + + assertThat(testExcludedLogicalSlotIndex).isEqualTo(verifyExcludedLogicalSlotIndex); + } + private void compareTwoUiccSlotMappings(Collection testUiccSlotMappings, Collection verifyUiccSlotMappings) { assertThat(testUiccSlotMappings.size()).isEqualTo(verifyUiccSlotMappings.size()); @@ -656,7 +698,13 @@ public class UiccSlotUtilTest { return slotMap; } + private List createUiccSlotMappingDualPortsBNoOrding() { + List slotMap = new ArrayList<>(); + slotMap.add(new UiccSlotMapping(0, ESIM_PHYSICAL_SLOT, 1)); + slotMap.add(new UiccSlotMapping(1, ESIM_PHYSICAL_SLOT, 0)); + return slotMap; + } /** * The "oneSimSlotDevice" has below cases * 1) The device is one psim slot and no esim slot