Merge "Switch does not append its state text to accessibility node infos."

    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

        info.setClassName(Switch.class.getName());

        CharSequence switchText = isChecked() ? mTextOn : mTextOff;

        if (!TextUtils.isEmpty(switchText)) {

            CharSequence oldText = info.getText();

            if (TextUtils.isEmpty(oldText)) {

                info.setText(switchText);

            } else {

                StringBuilder newText = new StringBuilder();

                newText.append(oldText).append(' ').append(switchText);

                info.setText(newText);

            }

        }

    }

}