Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ed16df7 authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

Merge "Update biometrics metrics enums" into main

parents d889fa62 9dfc6173

src/com/android/settings/biometrics/face/FaceSettingsAppsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/biometrics/face/FaceSettingsKeyguardUnlockPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

                            }

src/com/android/settings/biometrics/fingerprint/FingerprintSettingsAppsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }