PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new enum for parental consent UI.

Browse Source 
Bug: 188847063
Test: manual
Change-Id: I7b101f0d7cda415695ecdb7963a0e514c875b95c
This commit is contained in:
Joe Bolinger
2021-06-18 13:29:02 -07:00
parent fb515ed608
commit 2976b9bc14
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/biometrics/BiometricHandoffActivity.java
View File

@@ -70,7 +70,6 @@ public class BiometricHandoffActivity extends BiometricEnrollBase {
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
// TODO (b/188847063): add new category return SettingsEnums.BIOMETRIC_CONSENT_PARENT_TO_CHILD;
return SettingsEnums.BIOMETRIC_ENROLL_ACTIVITY;
} }
} }

8
src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.biometrics.face;
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;
import android.app.settings.SettingsEnums;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@@ -29,8 +30,6 @@ import com.android.settings.R;
/** /**
* Displays parental consent information for face authentication. * Displays parental consent information for face authentication.
*
* TODO (b/188847063): add new metrics category
*/ */
public class FaceEnrollParentalConsent extends FaceEnrollIntroduction { public class FaceEnrollParentalConsent extends FaceEnrollIntroduction {
@@ -103,4 +102,9 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction {
protected int getHeaderResDefault() { protected int getHeaderResDefault() {
return R.string.security_settings_face_enroll_consent_introduction_title; return R.string.security_settings_face_enroll_consent_introduction_title;
} }
@Override
public int getMetricsCategory() {
return SettingsEnums.FACE_PARENTAL_CONSENT;
}
} }

8
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.biometrics.fingerprint;
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;
import android.app.settings.SettingsEnums;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@@ -29,8 +30,6 @@ import com.android.settings.R;
/** /**
* Displays parental consent information for fingerprint authentication. * Displays parental consent information for fingerprint authentication.
*
* TODO (b/188847063): add new metrics category
*/ */
public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduction { public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduction {
@@ -97,4 +96,9 @@ public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduct
protected int getHeaderResDefault() { protected int getHeaderResDefault() {
return R.string.security_settings_fingerprint_enroll_consent_introduction_title; return R.string.security_settings_fingerprint_enroll_consent_introduction_title;
} }
@Override
public int getMetricsCategory() {
return SettingsEnums.FINGERPRINT_PARENTAL_CONSENT;
}
} }