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

Commit f75d044a authored by Hao Dong's avatar Hao Dong Committed by Android (Google) Code Review
Browse files

Merge "Add dependency on BiometricsSharedLib." into main

parents 369b3f3e 6b58dad5

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ android_library { 
        "android.hardware.dumpstate-V1.1-java",

        "android.hardware.dumpstate-V1-java",

        "lottie",

        "BiometricsSharedLib",

        "WifiTrackerLib",

        "SettingsLibActivityEmbedding",

        "Settings-change-ids",

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

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ import androidx.annotation.ColorInt; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settingslib.udfps.UdfpsOverlayParams;

import com.android.settingslib.udfps.UdfpsUtils;

import com.android.systemui.biometrics.UdfpsUtils;

import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupdesign.GlifLayout;

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;



import com.android.settings.R;

import com.android.settingslib.udfps.UdfpsOverlayParams;

import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;



/**

 * View corresponding with udfps_enroll_view.xml

src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;



import com.android.settings.R;

import com.android.settingslib.udfps.UdfpsOverlayParams;

import com.android.settingslib.udfps.UdfpsUtils;

import com.android.systemui.biometrics.UdfpsUtils;

import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;



/**

 * View corresponding with udfps_enroll_view.xml