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

Merge "Add dependency on BiometricsSharedLib." into main

Browse Source
This commit is contained in:
Hao Dong
2023-09-12 21:32:02 +00:00
committed by Android (Google) Code Review
parent 369b3f3ef9 6b58dad5b5
commit f75d044a90
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -105,6 +105,7 @@ android_library {
"android.hardware.dumpstate-V1.1-java", "android.hardware.dumpstate-V1.1-java",
"android.hardware.dumpstate-V1-java", "android.hardware.dumpstate-V1-java",
"lottie", "lottie",
"BiometricsSharedLib",
"WifiTrackerLib", "WifiTrackerLib",
"SettingsLibActivityEmbedding", "SettingsLibActivityEmbedding",
"Settings-change-ids", "Settings-change-ids",

4
src/com/android/settings/biometrics/fingerprint/UdfpsEnrollEnrollingView.java
View File

@@ -37,8 +37,8 @@ import androidx.annotation.ColorInt;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.udfps.UdfpsOverlayParams; import com.android.systemui.biometrics.UdfpsUtils;
import com.android.settingslib.udfps.UdfpsUtils; import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupdesign.GlifLayout; import com.google.android.setupdesign.GlifLayout;

2
src/com/android/settings/biometrics/fingerprint/UdfpsEnrollView.java
View File

@@ -33,7 +33,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.android.settings.R; 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 * View corresponding with udfps_enroll_view.xml

4
src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java
View File

@@ -37,8 +37,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.udfps.UdfpsOverlayParams; import com.android.systemui.biometrics.UdfpsUtils;
import com.android.settingslib.udfps.UdfpsUtils; import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
/** /**
* View corresponding with udfps_enroll_view.xml * View corresponding with udfps_enroll_view.xml