Merge "Add metrics for biometric onboarding & education" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
dc8db1bd63
@@ -18,6 +18,7 @@ package com.android.settings.biometrics.face;
|
||||
|
||||
import static android.provider.Settings.Secure.FACE_APP_ENABLED;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.hardware.face.FaceManager;
|
||||
import android.provider.Settings;
|
||||
@@ -49,6 +50,8 @@ public class FaceSettingsAppsPreferenceController extends
|
||||
|
||||
@Override
|
||||
public boolean setChecked(boolean isChecked) {
|
||||
mMetricsFeatureProvider.action(mContext,
|
||||
SettingsEnums.ACTION_FACE_ENABLED_FOR_APP, isChecked);
|
||||
return Settings.Secure.putIntForUser(mContext.getContentResolver(), FACE_APP_ENABLED,
|
||||
isChecked ? ON : OFF, getUserId());
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.settings.biometrics.face;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.hardware.face.FaceManager;
|
||||
import android.provider.Settings;
|
||||
@@ -122,6 +123,8 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
|
||||
|
||||
@Override
|
||||
public boolean setChecked(boolean isChecked) {
|
||||
mMetricsFeatureProvider.action(mContext,
|
||||
SettingsEnums.ACTION_FACE_REQUIRE_ATTENTION_SETTINGS, isChecked);
|
||||
// Optimistically update state and set to disabled until we know it succeeded.
|
||||
mPreference.setEnabled(false);
|
||||
mPreference.setChecked(isChecked);
|
||||
|
||||
@@ -18,6 +18,7 @@ package com.android.settings.biometrics.face;
|
||||
|
||||
import static android.provider.Settings.Secure.FACE_KEYGUARD_ENABLED;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.hardware.face.FaceManager;
|
||||
import android.provider.Settings;
|
||||
@@ -50,6 +51,8 @@ public class FaceSettingsKeyguardUnlockPreferenceController extends
|
||||
|
||||
@Override
|
||||
public boolean setChecked(boolean isChecked) {
|
||||
mMetricsFeatureProvider.action(mContext,
|
||||
SettingsEnums.ACTION_FACE_ENABLED_ON_KEYGUARD, isChecked);
|
||||
return Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
FACE_KEYGUARD_ENABLED, isChecked ? ON : OFF, getUserId());
|
||||
}
|
||||
|
||||
@@ -20,8 +20,10 @@ import android.app.admin.DevicePolicyManager;
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.core.TogglePreferenceController;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||
|
||||
/**
|
||||
* Abstract base class for all face settings toggles.
|
||||
@@ -29,9 +31,11 @@ import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
public abstract class FaceSettingsPreferenceController extends TogglePreferenceController {
|
||||
|
||||
private int mUserId;
|
||||
protected MetricsFeatureProvider mMetricsFeatureProvider;
|
||||
|
||||
public FaceSettingsPreferenceController(Context context, String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
|
||||
}
|
||||
|
||||
public void setUserId(int userId) {
|
||||
|
||||
@@ -1716,6 +1716,10 @@ public class FingerprintSettings extends SubSettings {
|
||||
@Override
|
||||
public void onAuthenticationError(
|
||||
int errorCode, @NonNull CharSequence errString) {
|
||||
mMetricsFeatureProvider.action(
|
||||
getContext(),
|
||||
SettingsEnums.ACTION_CHECK_FINGERPRINT,
|
||||
false);
|
||||
dialog.dismiss();
|
||||
}
|
||||
|
||||
@@ -1726,6 +1730,10 @@ public class FingerprintSettings extends SubSettings {
|
||||
FingerprintSettingsFragment parent =
|
||||
(FingerprintSettingsFragment) getTargetFragment();
|
||||
parent.highlightFingerprintItem(fingerId);
|
||||
mMetricsFeatureProvider.action(
|
||||
getContext(),
|
||||
SettingsEnums.ACTION_CHECK_FINGERPRINT,
|
||||
true);
|
||||
dialog.dismiss();
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ package com.android.settings.biometrics.fingerprint;
|
||||
|
||||
import static android.provider.Settings.Secure.FINGERPRINT_APP_ENABLED;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.provider.Settings;
|
||||
@@ -50,6 +51,8 @@ public class FingerprintSettingsAppsPreferenceController
|
||||
|
||||
@Override
|
||||
public boolean setChecked(boolean isChecked) {
|
||||
mMetricsFeatureProvider.action(mContext,
|
||||
SettingsEnums.ACTION_FINGERPRINT_ENABLED_FOR_APP, isChecked);
|
||||
return Settings.Secure.putIntForUser(mContext.getContentResolver(), FINGERPRINT_APP_ENABLED,
|
||||
isChecked ? ON : OFF, getUserId());
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ package com.android.settings.biometrics.fingerprint;
|
||||
|
||||
import static android.provider.Settings.Secure.FINGERPRINT_KEYGUARD_ENABLED;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.provider.Settings;
|
||||
@@ -51,6 +52,8 @@ public class FingerprintSettingsKeyguardUnlockPreferenceController
|
||||
|
||||
@Override
|
||||
public boolean setChecked(boolean isChecked) {
|
||||
mMetricsFeatureProvider.action(mContext,
|
||||
SettingsEnums.ACTION_FINGERPRINT_ENABLED_ON_KEYGUARD, isChecked);
|
||||
return Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
FINGERPRINT_KEYGUARD_ENABLED, isChecked ? ON : OFF, getUserId());
|
||||
}
|
||||
|
||||
@@ -20,8 +20,10 @@ import android.app.admin.DevicePolicyManager;
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.core.TogglePreferenceController;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||
|
||||
/**
|
||||
* Abstract base class for all fingerprint settings toggles.
|
||||
@@ -29,9 +31,11 @@ import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
public abstract class FingerprintSettingsPreferenceController extends TogglePreferenceController {
|
||||
|
||||
private int mUserId;
|
||||
protected MetricsFeatureProvider mMetricsFeatureProvider;
|
||||
|
||||
public FingerprintSettingsPreferenceController(Context context, String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
|
||||
}
|
||||
|
||||
public void setUserId(int userId) {
|
||||
|
||||
Reference in New Issue
Block a user