Merge "Streamline accessibility flow"
This commit is contained in:
@@ -85,12 +85,6 @@
|
||||
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>
|
||||
|
||||
|
@@ -43,7 +43,6 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
|
||||
private static final String TAG = "FaceIntro";
|
||||
|
||||
private FaceManager mFaceManager;
|
||||
private FaceEnrollAccessibilityToggle mSwitchVision;
|
||||
private FaceEnrollAccessibilityToggle mSwitchDiversity;
|
||||
|
||||
@Override
|
||||
@@ -57,7 +56,6 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
|
||||
accessibilityLayout.setVisibility(View.VISIBLE);
|
||||
});
|
||||
|
||||
mSwitchVision = findViewById(R.id.toggle_vision);
|
||||
mSwitchDiversity = findViewById(R.id.toggle_diversity);
|
||||
|
||||
mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class);
|
||||
@@ -167,7 +165,6 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
|
||||
} else {
|
||||
intent.setClass(this, FaceEnrollEnrolling.class);
|
||||
}
|
||||
intent.putExtra(EXTRA_KEY_REQUIRE_VISION, mSwitchVision.isChecked());
|
||||
intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, mSwitchDiversity.isChecked());
|
||||
return intent;
|
||||
}
|
||||
|
Reference in New Issue
Block a user