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

Merge "[A11Y][Wi-Fi] Fix multiple Spinner selected speak out at once." into rvc-dev

Browse Source
This commit is contained in:
Arc Wang
2020-04-10 02:25:50 +00:00
committed by Android (Google) Code Review
parent e1ba740cd8 98c17ee49f
commit 0713c43bbb
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -48,6 +48,7 @@ import android.view.KeyEvent;
import android.view.View;
import android.view.View.AccessibilityDelegate;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
import android.view.inputmethod.EditorInfo;
@@ -1020,6 +1021,8 @@ public class WifiConfigController implements TextWatcher,
mEapUserCertSpinner.setOnItemSelectedListener(this);
mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
setAccessibilityDelegateForSecuritySpinners();
}
if (refreshEapMethods) {
@@ -1148,6 +1151,26 @@ public class WifiConfigController implements TextWatcher,
}
}
private void setAccessibilityDelegateForSecuritySpinners() {
final AccessibilityDelegate selectedEventBlocker = new AccessibilityDelegate() {
@Override
public void sendAccessibilityEvent(View host, int eventType) {
if (eventType == AccessibilityEvent.TYPE_VIEW_SELECTED) {
// Ignore TYPE_VIEW_SELECTED or there will be multiple Spinner selected
// information for WifiController#showSecurityFields.
return;
}
super.sendAccessibilityEvent(host, eventType);
}
};
mEapMethodSpinner.setAccessibilityDelegate(selectedEventBlocker);
mPhase2Spinner.setAccessibilityDelegate(selectedEventBlocker);
mEapCaCertSpinner.setAccessibilityDelegate(selectedEventBlocker);
mEapOcspSpinner.setAccessibilityDelegate(selectedEventBlocker);
mEapUserCertSpinner.setAccessibilityDelegate(selectedEventBlocker);
}
/**
* EAP-PWD valid fields include
* identity

23
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -46,6 +46,7 @@ import android.view.KeyEvent;
import android.view.View;
import android.view.View.AccessibilityDelegate;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
import android.view.inputmethod.EditorInfo;
@@ -1014,6 +1015,8 @@ public class WifiConfigController2 implements TextWatcher,
mEapUserCertSpinner.setOnItemSelectedListener(this);
mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
mEapAnonymousView = (TextView) mView.findViewById(R.id.anonymous);
setAccessibilityDelegateForSecuritySpinners();
}
if (refreshEapMethods) {
@@ -1144,6 +1147,26 @@ public class WifiConfigController2 implements TextWatcher,
}
}
private void setAccessibilityDelegateForSecuritySpinners() {
final AccessibilityDelegate selectedEventBlocker = new AccessibilityDelegate() {
@Override
public void sendAccessibilityEvent(View host, int eventType) {
if (eventType == AccessibilityEvent.TYPE_VIEW_SELECTED) {
// Ignore TYPE_VIEW_SELECTED or there will be multiple Spinner selected
// information for WifiController2#showSecurityFields.
return;
}
super.sendAccessibilityEvent(host, eventType);
}
};
mEapMethodSpinner.setAccessibilityDelegate(selectedEventBlocker);
mPhase2Spinner.setAccessibilityDelegate(selectedEventBlocker);
mEapCaCertSpinner.setAccessibilityDelegate(selectedEventBlocker);
mEapOcspSpinner.setAccessibilityDelegate(selectedEventBlocker);
mEapUserCertSpinner.setAccessibilityDelegate(selectedEventBlocker);
}
/**
* EAP-PWD valid fields include
* identity