Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-09-14 11:37:15 -07:00
committed by Android (Google) Code Review
parent 0dbc410800 b8c50e8e44
commit e136a72810
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/Switch.java
View File

@@ -508,9 +508,9 @@ public class Switch extends CompoundButton {
@Override @Override
public void onPopulateAccessibilityEvent(AccessibilityEvent event) { public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
super.onPopulateAccessibilityEvent(event); super.onPopulateAccessibilityEvent(event);
CharSequence text = isChecked() ? mOnLayout.getText() : mOffLayout.getText(); Layout layout = isChecked() ? mOnLayout : mOffLayout;
if (!TextUtils.isEmpty(text)) { if (layout != null && !TextUtils.isEmpty(layout.getText())) {
event.getText().add(text); event.getText().add(layout.getText());
} }
} }