Merge "FaceEnrollIntro requires scroll for accessibility" into 24D1-dev

This commit is contained in:
David Lin
2024-06-27 00:51:14 +00:00
committed by Android (Google) Code Review

View File

@@ -38,6 +38,7 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -160,6 +161,10 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
inControlMessage.setMovementMethod(LinkMovementMethod.getInstance()); inControlMessage.setMovementMethod(LinkMovementMethod.getInstance());
lessSecure.setText(getLessSecureMessage()); lessSecure.setText(getLessSecureMessage());
final ScrollView scrollView =
findViewById(com.google.android.setupdesign.R.id.sud_scroll_view);
scrollView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
// Set up and show the "require eyes" info section if necessary. // Set up and show the "require eyes" info section if necessary.
if (getResources().getBoolean(R.bool.config_face_intro_show_require_eyes)) { if (getResources().getBoolean(R.bool.config_face_intro_show_require_eyes)) {
final LinearLayout infoRowRequireEyes = findViewById(R.id.info_row_require_eyes); final LinearLayout infoRowRequireEyes = findViewById(R.id.info_row_require_eyes);