Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Switch back to udfps_enroll_enrolling_non_scroll layout

Browse Source 
New one seems halfbaked? The UDFPS icon is misaligned when using it and
progress circle is missing.

Change-Id: I19d0a1ff973d79381f0f315469c823afedde9c02
This commit is contained in:
LuK1337
2025-10-04 23:43:01 +02:00
parent 56a70f85b4
commit 8fb73c62d4
1 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -252,30 +252,12 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
final UdfpsEnrollEnrollingView layout = final UdfpsEnrollEnrollingView layout =
(UdfpsEnrollEnrollingView) getLayoutInflater().inflate( (UdfpsEnrollEnrollingView) getLayoutInflater().inflate(
Flags.enrollLayoutTruncateImprovement() R.layout.udfps_enroll_enrolling_non_scroll, null, false);
? R.layout.udfps_enroll_enrolling :
R.layout.udfps_enroll_enrolling_non_scroll, null, false);
setUdfpsEnrollHelper(); setUdfpsEnrollHelper();
layout.initView(props.get(0), mUdfpsEnrollHelper, mAccessibilityManager); layout.initView(props.get(0), mUdfpsEnrollHelper, mAccessibilityManager);
setContentView(layout); setContentView(layout);
setDescriptionText(R.string.security_settings_udfps_enroll_start_message); setDescriptionText(R.string.security_settings_udfps_enroll_start_message);
if (Flags.enrollLayoutTruncateImprovement() && isPortrait) {
final UdfpsEnrollEnrollingView layoutView = (UdfpsEnrollEnrollingView) getLayout();
if (layoutView != null) {
final ScrollView headerScrollView = layout.findViewById(
R.id.sud_header_scroll_view);
if (headerScrollView != null) {
final long headerScrollDuration = getResources().getInteger(
R.integer.config_biometrics_header_scroll_duration);
layoutView.adjustScrollableHeaderHeight(
headerScrollView, mShouldShowLottie);
layoutView.headerVerticalScrolling(headerScrollView, headerScrollDuration,
mIsAccessibilityEnabled);
}
}
}
} else if (mCanAssumeSfps) { } else if (mCanAssumeSfps) {
mSfpsEnrollmentFeature = FeatureFactory.getFeatureFactory() mSfpsEnrollmentFeature = FeatureFactory.getFeatureFactory()
.getFingerprintFeatureProvider().getSfpsEnrollmentFeature(); .getFingerprintFeatureProvider().getSfpsEnrollmentFeature();
@@ -1248,19 +1230,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
@Override @Override
public void onWindowFocusChanged(boolean hasWindowFocus) { public void onWindowFocusChanged(boolean hasWindowFocus) {
super.onWindowFocusChanged(hasWindowFocus); super.onWindowFocusChanged(hasWindowFocus);
if (Flags.enrollLayoutTruncateImprovement()) {
adjustEnrollViewIfOverlappedWithFooterBar();
}
}
private void adjustEnrollViewIfOverlappedWithFooterBar() {
if (mCanAssumeUdfps) {
final UdfpsEnrollEnrollingView layoutView = (UdfpsEnrollEnrollingView) getLayout();
if (layoutView != null) {
layoutView.adjustUdfpsVieWithFooterBar();
layoutView.onUdfpsSensorRectUpdated();
}
}
} }
public static class IconTouchDialog extends InstrumentedDialogFragment { public static class IconTouchDialog extends InstrumentedDialogFragment {