PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use RestrictedPreference for all biometric settings." into sc-dev

Browse Source
This commit is contained in:
Joe Bolinger
2021-07-27 17:25:25 +00:00
committed by Android (Google) Code Review
parent 1c95bda96f 61d998406d
commit 7e9077fd14
9 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/security_dashboard_settings.xml
View File

@@ -153,17 +153,17 @@
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile" android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" /> settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
<Preference <com.android.settingslib.RestrictedPreference
android:key="fingerprint_settings_profile" android:key="fingerprint_settings_profile"
android:title="@string/security_settings_fingerprint_preference_title" android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder" /> android:summary="@string/summary_placeholder" />
<Preference <com.android.settingslib.RestrictedPreference
android:key="face_settings_profile" android:key="face_settings_profile"
android:title="@string/security_settings_face_preference_title" android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder" /> android:summary="@string/summary_placeholder" />
<Preference <com.android.settingslib.RestrictedPreference
android:key="biometric_settings_profile" android:key="biometric_settings_profile"
android:title="@string/security_settings_biometric_preference_title" android:title="@string/security_settings_biometric_preference_title"
android:summary="@string/summary_placeholder" /> android:summary="@string/summary_placeholder" />

4
res/xml/security_settings_combined_biometric.xml
View File

@@ -26,14 +26,14 @@
android:key="biometric_ways_to_unlock" android:key="biometric_ways_to_unlock"
android:title="@string/biometric_settings_category_ways_to_unlock"> android:title="@string/biometric_settings_category_ways_to_unlock">
<Preference <com.android.settingslib.RestrictedPreference
android:key="biometric_face_settings" android:key="biometric_face_settings"
android:title="@string/security_settings_face_preference_title" android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_face_settings" settings:keywords="@string/keywords_face_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" /> settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" />
<Preference <com.android.settingslib.RestrictedPreference
android:key="biometric_fingerprint_settings" android:key="biometric_fingerprint_settings"
android:title="@string/security_settings_fingerprint_preference_title" android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"

4
res/xml/security_settings_combined_biometric_profile.xml
View File

@@ -26,14 +26,14 @@
android:key="biometric_ways_to_unlock" android:key="biometric_ways_to_unlock"
android:title="@string/biometric_settings_category_ways_to_unlock"> android:title="@string/biometric_settings_category_ways_to_unlock">
<Preference <com.android.settingslib.RestrictedPreference
android:key="biometric_fingerprint_settings_profile" android:key="biometric_fingerprint_settings_profile"
android:title="@string/security_settings_fingerprint_preference_title" android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_fingerprint_settings" settings:keywords="@string/keywords_fingerprint_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" /> settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
<Preference <com.android.settingslib.RestrictedPreference
android:key="biometric_face_settings_profile" android:key="biometric_face_settings_profile"
android:title="@string/security_settings_face_preference_title" android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"

2
src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
View File

@@ -61,7 +61,7 @@ public class CombinedBiometricStatusPreferenceController extends
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreference = screen.findPreference(KEY_BIOMETRIC_SETTINGS); mPreference = screen.findPreference(mPreferenceKey);
} }
@Override @Override

2
src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
View File

@@ -53,7 +53,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreference = screen.findPreference(KEY_FACE_SETTINGS); mPreference = screen.findPreference(mPreferenceKey);
} }
@Override @Override

2
src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
View File

@@ -52,7 +52,7 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mPreference = screen.findPreference(KEY_FINGERPRINT_SETTINGS); mPreference = screen.findPreference(mPreferenceKey);
} }
@Override @Override

4
tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceControllerTest.java
View File

@@ -48,6 +48,8 @@ import org.robolectric.shadows.ShadowApplication;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class CombinedBiometricStatusPreferenceControllerTest { public class CombinedBiometricStatusPreferenceControllerTest {
private static final String TEST_PREF_KEY = "foo";
@Mock @Mock
private LockPatternUtils mLockPatternUtils; private LockPatternUtils mLockPatternUtils;
@Mock @Mock
@@ -80,7 +82,7 @@ public class CombinedBiometricStatusPreferenceControllerTest {
when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext)) when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
.thenReturn(mLockPatternUtils); .thenReturn(mLockPatternUtils);
when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234}); when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
mController = new CombinedBiometricStatusPreferenceController(mContext); mController = new CombinedBiometricStatusPreferenceController(mContext, TEST_PREF_KEY);
} }
@Test @Test

5
tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
View File

@@ -55,6 +55,9 @@ import java.util.Collections;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class FaceStatusPreferenceControllerTest { public class FaceStatusPreferenceControllerTest {
private static final String TEST_PREF_KEY = "baz";
@Mock @Mock
private LockPatternUtils mLockPatternUtils; private LockPatternUtils mLockPatternUtils;
@Mock @Mock
@@ -82,7 +85,7 @@ public class FaceStatusPreferenceControllerTest {
when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext)) when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
.thenReturn(mLockPatternUtils); .thenReturn(mLockPatternUtils);
when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234}); when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
mController = new FaceStatusPreferenceController(mContext); mController = new FaceStatusPreferenceController(mContext, TEST_PREF_KEY);
} }
@Test @Test

5
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
View File

@@ -44,6 +44,7 @@ import org.robolectric.shadows.ShadowApplication;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class FingerprintProfileStatusPreferenceControllerTest { public class FingerprintProfileStatusPreferenceControllerTest {
private static final String TEST_PREF_KEY = "bar";
private static final int FAKE_PROFILE_USER_ID = 1234; private static final int FAKE_PROFILE_USER_ID = 1234;
@Mock @Mock
@@ -73,7 +74,7 @@ public class FingerprintProfileStatusPreferenceControllerTest {
when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext)) when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
.thenReturn(mLockPatternUtils); .thenReturn(mLockPatternUtils);
when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234}); when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {1234});
mController = new FingerprintProfileStatusPreferenceController(mContext); mController = new FingerprintProfileStatusPreferenceController(mContext, TEST_PREF_KEY);
} }
@Test @Test
@@ -104,6 +105,8 @@ public class FingerprintProfileStatusPreferenceControllerTest {
@Test @Test
public void getPreferenceKey_byDefault_returnsDefaultValue() { public void getPreferenceKey_byDefault_returnsDefaultValue() {
mController = new FingerprintProfileStatusPreferenceController(mContext);
assertThat(mController.getPreferenceKey()).isEqualTo("fingerprint_settings_profile"); assertThat(mController.getPreferenceKey()).isEqualTo("fingerprint_settings_profile");
} }