Merge "Streamline accessibility flow"

                    android:layout_height="wrap_content"

                    FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>

                <com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle

                    android:id="@+id/toggle_vision"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_vision"/>

            </LinearLayout>

        </FrameLayout>

    private static final String TAG = "FaceIntro";

    private FaceManager mFaceManager;

    private FaceEnrollAccessibilityToggle mSwitchVision;

    private FaceEnrollAccessibilityToggle mSwitchDiversity;

    @Override

            accessibilityLayout.setVisibility(View.VISIBLE);

        });

        mSwitchVision = findViewById(R.id.toggle_vision);

        mSwitchDiversity = findViewById(R.id.toggle_diversity);

        mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);

        } else {

            intent.setClass(this, FaceEnrollEnrolling.class);

        }

        intent.putExtra(EXTRA_KEY_REQUIRE_VISION, mSwitchVision.isChecked());

        intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, mSwitchDiversity.isChecked());

        return intent;

    }