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

Merge "Fixed talkback issue" into qt-dev

Browse Source 
am: b2f19c55b5

Change-Id: Ib2e2029bbd6da18307e9652a7ac4a08e4320d9c9
This commit is contained in:
Joshua Mccloskey
2019-05-14 12:18:22 -07:00
committed by android-build-merger
parent 7db72f0ef1 b2f19c55b5
commit bda38381c2
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;
@@ -105,11 +106,17 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
.setTheme(R.style.SudGlifButton_Primary) .setTheme(R.style.SudGlifButton_Primary)
.build(); .build();
boolean accessibilityEnabled = false;
final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(
AccessibilityManager.class);
if (accessibilityManager != null) {
accessibilityEnabled = accessibilityManager.isEnabled();
}
mFooterBarMixin.setPrimaryButton(footerButton); mFooterBarMixin.setPrimaryButton(footerButton);
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);
@@ -128,6 +135,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
mSwitchDiversity = findViewById(R.id.toggle_diversity); mSwitchDiversity = findViewById(R.id.toggle_diversity);
mSwitchDiversity.setListener(mSwitchDiversityListener); mSwitchDiversity.setListener(mSwitchDiversityListener);
if (accessibilityEnabled) {
accessibilityButton.callOnClick();
}
} }
@Override @Override