Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0713c43b authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

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

parents e1ba740c 98c17ee4

src/com/android/settings/wifi/WifiConfigController.java

+23 −0
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/wifi/WifiConfigController2.java

+23 −0
Original line number Diff line number Diff line
@@ -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