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

Commit d9322685 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge changes from topic "unicorn-hand" into sc-dev am: daeda052 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: If97be85445da06264840e618efc23dd1c194e1d5
parents f7ee87c9 daeda052

src/com/android/settings/biometrics/BiometricHandoffActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ public class BiometricHandoffActivity extends BiometricEnrollBase { 


    @Override

    public int getMetricsCategory() {

        // TODO (b/188847063): add new category

        return SettingsEnums.BIOMETRIC_ENROLL_ACTIVITY;

        return SettingsEnums.BIOMETRIC_CONSENT_PARENT_TO_CHILD;

    }

}

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

+6 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.biometrics.face; 


import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;



import android.app.settings.SettingsEnums;

import android.content.Intent;

import android.os.Bundle;

import android.view.View;
@@ -29,8 +30,6 @@ import com.android.settings.R; 


/**

 * Displays parental consent information for face authentication.

 *

 * TODO (b/188847063): add new metrics category

 */

public class FaceEnrollParentalConsent extends FaceEnrollIntroduction {
@@ -103,4 +102,9 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction { 
    protected int getHeaderResDefault() {

        return R.string.security_settings_face_enroll_consent_introduction_title;

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.FACE_PARENTAL_CONSENT;

    }

}

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

+6 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.biometrics.fingerprint; 


import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;



import android.app.settings.SettingsEnums;

import android.content.Intent;

import android.os.Bundle;

import android.view.View;
@@ -29,8 +30,6 @@ import com.android.settings.R; 


/**

 * Displays parental consent information for fingerprint authentication.

 *

 * TODO (b/188847063): add new metrics category

 */

public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduction {
@@ -97,4 +96,9 @@ public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduct 
    protected int getHeaderResDefault() {

        return R.string.security_settings_fingerprint_enroll_consent_introduction_title;

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.FINGERPRINT_PARENTAL_CONSENT;

    }

}