Update biometrics metrics enums
Bug: 370940762 Test: atest FaceSettingsAppsPreferenceControllerTest FaceSettingsKeyguardUnlockPreferenceControllerTest FingerprintSettingsAppsPreferenceControllerTest FingerprintSettingsKeyguardUnlockPreferenceControllerTest Flag: com.android.settings.flags.biometrics_onboarding_education Change-Id: Iabd5d27358a3cec966210af2fe54079c0d535808
This commit is contained in:
@@ -51,7 +51,7 @@ public class FaceSettingsAppsPreferenceController extends
|
|||||||
@Override
|
@Override
|
||||||
public boolean setChecked(boolean isChecked) {
|
public boolean setChecked(boolean isChecked) {
|
||||||
mMetricsFeatureProvider.action(mContext,
|
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,
|
return Settings.Secure.putIntForUser(mContext.getContentResolver(), FACE_APP_ENABLED,
|
||||||
isChecked ? ON : OFF, getUserId());
|
isChecked ? ON : OFF, getUserId());
|
||||||
}
|
}
|
||||||
|
@@ -124,7 +124,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
|
|||||||
@Override
|
@Override
|
||||||
public boolean setChecked(boolean isChecked) {
|
public boolean setChecked(boolean isChecked) {
|
||||||
mMetricsFeatureProvider.action(mContext,
|
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.
|
// Optimistically update state and set to disabled until we know it succeeded.
|
||||||
mPreference.setEnabled(false);
|
mPreference.setEnabled(false);
|
||||||
mPreference.setChecked(isChecked);
|
mPreference.setChecked(isChecked);
|
||||||
|
@@ -52,7 +52,7 @@ public class FaceSettingsKeyguardUnlockPreferenceController extends
|
|||||||
@Override
|
@Override
|
||||||
public boolean setChecked(boolean isChecked) {
|
public boolean setChecked(boolean isChecked) {
|
||||||
mMetricsFeatureProvider.action(mContext,
|
mMetricsFeatureProvider.action(mContext,
|
||||||
SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD, isChecked);
|
SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD_SETTINGS, isChecked);
|
||||||
return Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
return Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||||
FACE_KEYGUARD_ENABLED, isChecked ? ON : OFF, getUserId());
|
FACE_KEYGUARD_ENABLED, isChecked ? ON : OFF, getUserId());
|
||||||
}
|
}
|
||||||
|
@@ -1725,7 +1725,7 @@ public class FingerprintSettings extends SubSettings {
|
|||||||
int errorCode, @NonNull CharSequence errString) {
|
int errorCode, @NonNull CharSequence errString) {
|
||||||
mMetricsFeatureProvider.action(
|
mMetricsFeatureProvider.action(
|
||||||
getContext(),
|
getContext(),
|
||||||
SettingsEnums.ACTION_CHECK_FINGERPRINT,
|
SettingsEnums.ACTION_CHECK_FINGERPRINT_SETTINGS,
|
||||||
false);
|
false);
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
}
|
}
|
||||||
@@ -1739,7 +1739,7 @@ public class FingerprintSettings extends SubSettings {
|
|||||||
parent.highlightFingerprintItem(fingerId);
|
parent.highlightFingerprintItem(fingerId);
|
||||||
mMetricsFeatureProvider.action(
|
mMetricsFeatureProvider.action(
|
||||||
getContext(),
|
getContext(),
|
||||||
SettingsEnums.ACTION_CHECK_FINGERPRINT,
|
SettingsEnums.ACTION_CHECK_FINGERPRINT_SETTINGS,
|
||||||
true);
|
true);
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
}
|
}
|
||||||
|
@@ -52,7 +52,7 @@ public class FingerprintSettingsAppsPreferenceController
|
|||||||
@Override
|
@Override
|
||||||
public boolean setChecked(boolean isChecked) {
|
public boolean setChecked(boolean isChecked) {
|
||||||
mMetricsFeatureProvider.action(mContext,
|
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,
|
return Settings.Secure.putIntForUser(mContext.getContentResolver(), FINGERPRINT_APP_ENABLED,
|
||||||
isChecked ? ON : OFF, getUserId());
|
isChecked ? ON : OFF, getUserId());
|
||||||
}
|
}
|
||||||
|
@@ -53,7 +53,7 @@ public class FingerprintSettingsKeyguardUnlockPreferenceController
|
|||||||
@Override
|
@Override
|
||||||
public boolean setChecked(boolean isChecked) {
|
public boolean setChecked(boolean isChecked) {
|
||||||
mMetricsFeatureProvider.action(mContext,
|
mMetricsFeatureProvider.action(mContext,
|
||||||
SettingsEnums.ACTION_FINGERPRINT_ENABLED_ON_KEYGUARD, isChecked);
|
SettingsEnums.ACTION_FINGERPRINTS_ENABLED_ON_KEYGUARD_SETTINGS, isChecked);
|
||||||
return Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
return Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||||
FINGERPRINT_KEYGUARD_ENABLED, isChecked ? ON : OFF, getUserId());
|
FINGERPRINT_KEYGUARD_ENABLED, isChecked ? ON : OFF, getUserId());
|
||||||
}
|
}
|
||||||
|
@@ -57,13 +57,13 @@ public class FaceSettingsAppsPreferenceControllerTest {
|
|||||||
public void setChecked_checked_updateMetrics() {
|
public void setChecked_checked_updateMetrics() {
|
||||||
mController.setChecked(true);
|
mController.setChecked(true);
|
||||||
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
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
|
@Test
|
||||||
public void setChecked_unchecked_updateMetrics() {
|
public void setChecked_unchecked_updateMetrics() {
|
||||||
mController.setChecked(false);
|
mController.setChecked(false);
|
||||||
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
||||||
eq(SettingsEnums.ACTION_FACE_ENABLED_FOR_APP), eq(false));
|
eq(SettingsEnums.ACTION_FACE_ENABLED_FOR_APP_SETTINGS), eq(false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -57,13 +57,13 @@ public class FaceSettingsKeyguardUnlockPreferenceControllerTest {
|
|||||||
public void setChecked_checked_updateMetrics() {
|
public void setChecked_checked_updateMetrics() {
|
||||||
mController.setChecked(true);
|
mController.setChecked(true);
|
||||||
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
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
|
@Test
|
||||||
public void setChecked_unchecked_updateMetrics() {
|
public void setChecked_unchecked_updateMetrics() {
|
||||||
mController.setChecked(false);
|
mController.setChecked(false);
|
||||||
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
||||||
eq(SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD), eq(false));
|
eq(SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD_SETTINGS), eq(false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -57,13 +57,13 @@ public class FingerprintSettingsAppsPreferenceControllerTest {
|
|||||||
public void setChecked_checked_updateMetrics() {
|
public void setChecked_checked_updateMetrics() {
|
||||||
mController.setChecked(true);
|
mController.setChecked(true);
|
||||||
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
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
|
@Test
|
||||||
public void setChecked_unchecked_updateMetrics() {
|
public void setChecked_unchecked_updateMetrics() {
|
||||||
mController.setChecked(false);
|
mController.setChecked(false);
|
||||||
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
||||||
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP), eq(false));
|
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP_SETTINGS), eq(false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -57,13 +57,13 @@ public class FingerprintSettingsKeyguardUnlockPreferenceControllerTest {
|
|||||||
public void setChecked_checked_updateMetrics() {
|
public void setChecked_checked_updateMetrics() {
|
||||||
mController.setChecked(true);
|
mController.setChecked(true);
|
||||||
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
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
|
@Test
|
||||||
public void setChecked_unchecked_updateMetrics() {
|
public void setChecked_unchecked_updateMetrics() {
|
||||||
mController.setChecked(false);
|
mController.setChecked(false);
|
||||||
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
verify(mFeatureFactory.metricsFeatureProvider).action(any(),
|
||||||
eq(SettingsEnums.ACTION_FINGERPRINT_ENABLED_ON_KEYGUARD), eq(false));
|
eq(SettingsEnums.ACTION_FINGERPRINTS_ENABLED_ON_KEYGUARD_SETTINGS), eq(false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user