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

Update biometrics metrics enums

Browse Source 
Bug: 370940762
Test: atest FaceSettingsAppsPreferenceControllerTest
            FaceSettingsKeyguardUnlockPreferenceControllerTest
	    FingerprintSettingsAppsPreferenceControllerTest
	    FingerprintSettingsKeyguardUnlockPreferenceControllerTest
Flag: com.android.settings.flags.biometrics_onboarding_education

Change-Id: Iabd5d27358a3cec966210af2fe54079c0d535808
This commit is contained in:
Shawn Lin
2025-03-11 11:33:58 +00:00
parent de3ec7e343
commit 9dfc6173c4
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ public class FaceSettingsAppsPreferenceController extends
@Override
public boolean setChecked(boolean isChecked) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_FACE_ENABLED_FOR_APP, isChecked);
SettingsEnums.ACTION_FACE_ENABLED_FOR_APP_SETTINGS, isChecked);
return Settings.Secure.putIntForUser(mContext.getContentResolver(), FACE_APP_ENABLED,
isChecked ? ON : OFF, getUserId());
}

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

@@ -124,7 +124,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
@Override
public boolean setChecked(boolean isChecked) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_FACE_REQUIRE_ATTENTION_SETTINGS, isChecked);
SettingsEnums.ACTION_FACE_REQUIRE_ATTENTION_FROM_SETTINGS, isChecked);
// Optimistically update state and set to disabled until we know it succeeded.
mPreference.setEnabled(false);
mPreference.setChecked(isChecked);

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

@@ -52,7 +52,7 @@ public class FaceSettingsKeyguardUnlockPreferenceController extends
@Override
public boolean setChecked(boolean isChecked) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD, isChecked);
SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD_SETTINGS, isChecked);
return Settings.Secure.putIntForUser(mContext.getContentResolver(),
FACE_KEYGUARD_ENABLED, isChecked ? ON : OFF, getUserId());
}

4
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -1725,7 +1725,7 @@ public class FingerprintSettings extends SubSettings {
int errorCode, @NonNull CharSequence errString) {
mMetricsFeatureProvider.action(
getContext(),
SettingsEnums.ACTION_CHECK_FINGERPRINT,
SettingsEnums.ACTION_CHECK_FINGERPRINT_SETTINGS,
false);
dialog.dismiss();
}
@@ -1739,7 +1739,7 @@ public class FingerprintSettings extends SubSettings {
parent.highlightFingerprintItem(fingerId);
mMetricsFeatureProvider.action(
getContext(),
SettingsEnums.ACTION_CHECK_FINGERPRINT,
SettingsEnums.ACTION_CHECK_FINGERPRINT_SETTINGS,
true);
dialog.dismiss();
}

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

@@ -52,7 +52,7 @@ public class FingerprintSettingsAppsPreferenceController
@Override
public boolean setChecked(boolean isChecked) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP, isChecked);
SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP_SETTINGS, isChecked);
return Settings.Secure.putIntForUser(mContext.getContentResolver(), FINGERPRINT_APP_ENABLED,
isChecked ? ON : OFF, getUserId());
}

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

@@ -53,7 +53,7 @@ public class FingerprintSettingsKeyguardUnlockPreferenceController
@Override
public boolean setChecked(boolean isChecked) {
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_FINGERPRINT_ENABLED_ON_KEYGUARD, isChecked);
SettingsEnums.ACTION_FINGERPRINTS_ENABLED_ON_KEYGUARD_SETTINGS, isChecked);
return Settings.Secure.putIntForUser(mContext.getContentResolver(),
FINGERPRINT_KEYGUARD_ENABLED, isChecked ? ON : OFF, getUserId());
}

4
tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceControllerTest.java
View File

@@ -57,13 +57,13 @@ public class FaceSettingsAppsPreferenceControllerTest {
public void setChecked_checked_updateMetrics() {
mController.setChecked(true);
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
eq(SettingsEnums.ACTION_FACE_ENABLED_FOR_APP), eq(true));
eq(SettingsEnums.ACTION_FACE_ENABLED_FOR_APP_SETTINGS), eq(true));
}
@Test
public void setChecked_unchecked_updateMetrics() {
mController.setChecked(false);
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
eq(SettingsEnums.ACTION_FACE_ENABLED_FOR_APP), eq(false));
eq(SettingsEnums.ACTION_FACE_ENABLED_FOR_APP_SETTINGS), eq(false));
}
}

4
tests/unit/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceControllerTest.java
View File

@@ -57,13 +57,13 @@ public class FaceSettingsKeyguardUnlockPreferenceControllerTest {
public void setChecked_checked_updateMetrics() {
mController.setChecked(true);
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
eq(SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD), eq(true));
eq(SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD_SETTINGS), eq(true));
}
@Test
public void setChecked_unchecked_updateMetrics() {
mController.setChecked(false);
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
eq(SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD), eq(false));
eq(SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD_SETTINGS), eq(false));
}
}

4
tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceControllerTest.java
View File

@@ -57,13 +57,13 @@ public class FingerprintSettingsAppsPreferenceControllerTest {
public void setChecked_checked_updateMetrics() {
mController.setChecked(true);
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP), eq(true));
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP_SETTINGS), eq(true));
}
@Test
public void setChecked_unchecked_updateMetrics() {
mController.setChecked(false);
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP), eq(false));
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP_SETTINGS), eq(false));
}
}

4
tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceControllerTest.java
View File

@@ -57,13 +57,13 @@ public class FingerprintSettingsKeyguardUnlockPreferenceControllerTest {
public void setChecked_checked_updateMetrics() {
mController.setChecked(true);
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_ON_KEYGUARD), eq(true));
eq(SettingsEnums.ACTION_FINGERPRINTS_ENABLED_ON_KEYGUARD_SETTINGS), eq(true));
}
@Test
public void setChecked_unchecked_updateMetrics() {
mController.setChecked(false);
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_ON_KEYGUARD), eq(false));
eq(SettingsEnums.ACTION_FINGERPRINTS_ENABLED_ON_KEYGUARD_SETTINGS), eq(false));
}
}