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

Commit 17abee76 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15560884, 15560845, 15560903, 15560904, 15560905,... 

Merge cherrypicks of [15560884, 15560845, 15560903, 15560904, 15560905, 15560906, 15560769, 15560755, 15557357, 15557358] into sc-release

Change-Id: I32876c55d01a88e477117fc7ebf87f196e3124a0
parents 78d69843 001fd1b1

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

+8 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager; 
import android.content.Intent;

import android.graphics.PorterDuff;

import android.graphics.PorterDuffColorFilter;

import android.hardware.biometrics.BiometricAuthenticator;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;
@@ -62,6 +63,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
    private TextView mErrorText;

    protected boolean mConfirmingCredentials;

    protected boolean mNextClicked;

    private boolean mParentalConsentRequired;



    @Nullable private PorterDuffColorFilter mIconColorFilter;
@@ -138,6 +140,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
     */

    public abstract void onClick(LinkSpan span);



    public abstract @BiometricAuthenticator.Modality int getModality();



    protected interface GenerateChallengeCallback {

        void onChallengeGenerated(int sensorId, int userId, long challenge);

    }
@@ -161,7 +165,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
        mBiometricUnlockDisabledByAdmin = isDisabledByAdmin();



        setContentView(getLayoutResource());

        if (mBiometricUnlockDisabledByAdmin) {

        mParentalConsentRequired = ParentalControlsUtils.parentConsentRequired(this, getModality())

                != null;

        if (mBiometricUnlockDisabledByAdmin && !mParentalConsentRequired) {

            setHeaderText(getHeaderResDisabledByAdmin());

        } else {

            setHeaderText(getHeaderResDefault());
@@ -399,7 +405,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
    protected void initViews() {

        super.initViews();



        if (mBiometricUnlockDisabledByAdmin) {

        if (mBiometricUnlockDisabledByAdmin && !mParentalConsentRequired) {

            setDescriptionText(getDescriptionResDisabledByAdmin());

        }

    }

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

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.biometrics.face; 
import android.app.admin.DevicePolicyManager;

import android.app.settings.SettingsEnums;

import android.content.Intent;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.face.FaceManager;

import android.hardware.face.FaceSensorPropertiesInternal;

import android.os.Bundle;
@@ -283,6 +284,11 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 
        // TODO(b/110906762)

    }



    @Override

    public @BiometricAuthenticator.Modality int getModality() {

        return BiometricAuthenticator.TYPE_FACE;

    }



    @Override

    @NonNull

    protected FooterButton getPrimaryFooterButton() {

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

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager; 
import android.app.settings.SettingsEnums;

import android.content.ActivityNotFoundException;

import android.content.Intent;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.fingerprint.FingerprintManager;

import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;

import android.os.Bundle;
@@ -272,6 +273,11 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { 
        }

    }



    @Override

    public @BiometricAuthenticator.Modality int getModality() {

        return BiometricAuthenticator.TYPE_FINGERPRINT;

    }



    @Override

    @NonNull

    protected FooterButton getPrimaryFooterButton() {