From 9dfc6173c489b2fcce492324e154f9ae6218e107 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Tue, 11 Mar 2025 11:33:58 +0000 Subject: [PATCH] Update biometrics metrics enums Bug: 370940762 Test: atest FaceSettingsAppsPreferenceControllerTest FaceSettingsKeyguardUnlockPreferenceControllerTest FingerprintSettingsAppsPreferenceControllerTest FingerprintSettingsKeyguardUnlockPreferenceControllerTest Flag: com.android.settings.flags.biometrics_onboarding_education Change-Id: Iabd5d27358a3cec966210af2fe54079c0d535808 --- .../biometrics/face/FaceSettingsAppsPreferenceController.java | 2 +- .../face/FaceSettingsAttentionPreferenceController.java | 2 +- .../face/FaceSettingsKeyguardUnlockPreferenceController.java | 2 +- .../settings/biometrics/fingerprint/FingerprintSettings.java | 4 ++-- .../FingerprintSettingsAppsPreferenceController.java | 2 +- ...FingerprintSettingsKeyguardUnlockPreferenceController.java | 2 +- .../face/FaceSettingsAppsPreferenceControllerTest.java | 4 ++-- .../FaceSettingsKeyguardUnlockPreferenceControllerTest.java | 4 ++-- .../FingerprintSettingsAppsPreferenceControllerTest.java | 4 ++-- ...erprintSettingsKeyguardUnlockPreferenceControllerTest.java | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java index 69ea2369d57..9500c25a8ec 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java @@ -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()); } diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java index 5ca0665e1cc..1c3653e152c 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java @@ -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); diff --git a/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java index 5262f9a75c6..5ff15232a02 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java @@ -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()); } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 8206fbb32cb..283e3420607 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -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(); } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceController.java index f2a49f6edef..63fc3dcef23 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceController.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceController.java @@ -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()); } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceController.java index aa1a87016ee..56ef2c3db8b 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceController.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceController.java @@ -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()); } diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceControllerTest.java index 3161c9d2fca..2ff7db48cb1 100644 --- a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceControllerTest.java @@ -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)); } } diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceControllerTest.java index db906b912f0..1be54e45732 100644 --- a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceControllerTest.java @@ -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)); } } diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceControllerTest.java index 6105aee4760..36e2d9d09d3 100644 --- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceControllerTest.java @@ -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)); } } diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceControllerTest.java index 462b5ebf3ef..4135fa1965f 100644 --- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsKeyguardUnlockPreferenceControllerTest.java @@ -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)); } }