PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Corrected flow for accessibility." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-13 23:39:45 +00:00
committed by Android (Google) Code Review
parent ff5fb3f2d4 b9cb83e4c6
commit 872dc6b4bd
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -30,6 +30,7 @@ import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.Button; import android.widget.Button;
import android.widget.CompoundButton; import android.widget.CompoundButton;
@@ -98,6 +99,16 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
.build() .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) final FooterButton footerButton = new FooterButton.Builder(this)
.setText(R.string.wizard_next) .setText(R.string.wizard_next)
.setListener(this::onNextButtonClick) .setListener(this::onNextButtonClick)
@@ -109,7 +120,7 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
final Context context = getApplicationContext(); final Context context = getApplicationContext();
final boolean didDisplayEdu = Settings.Secure.getIntForUser(context.getContentResolver(), final boolean didDisplayEdu = Settings.Secure.getIntForUser(context.getContentResolver(),
FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, OFF, mUserId) == ON; FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, OFF, mUserId) == ON;
if (!didDisplayEdu) { if (!didDisplayEdu && !accessibilityEnabled) {
Settings.Secure.putIntForUser(context.getContentResolver(), Settings.Secure.putIntForUser(context.getContentResolver(),
FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, ON, mUserId); FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, ON, mUserId);
footerButton.setEnabled(false); footerButton.setEnabled(false);