Revert "Corrected flow for accessibility."

This reverts commit b9cb83e4c6.

Reason for revert: broke build

Bug: 132635400

Change-Id: I15d4db26e3dd9172894354a39be13acc69642090
This commit is contained in:
Kevin Chyn
2019-05-14 00:45:02 +00:00
parent b9cb83e4c6
commit 0c37f27355

View File

@@ -30,7 +30,6 @@ import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.Button;
import android.widget.CompoundButton;
@@ -108,16 +107,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
.build()
);
boolean accessibilityEnabled = false;
final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(
AccessibilityManager.class);
if (accessibilityManager != null) {
accessibilityEnabled = accessibilityManager.isEnabled();
if (accessibilityEnabled) {
accessibilityButton.callOnClick();
}
}
final FooterButton footerButton = new FooterButton.Builder(this)
.setText(R.string.wizard_next)
.setListener(this::onNextButtonClick)
@@ -129,7 +118,7 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
final Context context = getApplicationContext();
final boolean didDisplayEdu = Settings.Secure.getIntForUser(context.getContentResolver(),
FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, OFF, mUserId) == ON;
if (!didDisplayEdu && !accessibilityEnabled) {
if (!didDisplayEdu) {
Settings.Secure.putIntForUser(context.getContentResolver(),
FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, ON, mUserId);
footerButton.setEnabled(false);