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

Commit e136a728 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev

parents 0dbc4108 b8c50e8e
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -508,9 +508,9 @@ public class Switch extends CompoundButton {
    @Override
    public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
        super.onPopulateAccessibilityEvent(event);
        CharSequence text = isChecked() ? mOnLayout.getText() : mOffLayout.getText();
        if (!TextUtils.isEmpty(text)) {
            event.getText().add(text);
        Layout layout =  isChecked() ? mOnLayout : mOffLayout;
        if (layout != null && !TextUtils.isEmpty(layout.getText())) {
            event.getText().add(layout.getText());
        }
    }