diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/Switch.java | 3 | ||||
| -rw-r--r-- | core/java/android/widget/ToggleButton.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index ac2336c4a10f..fbd29ba2f592 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -309,6 +309,9 @@ public class Switch extends CompoundButton { // Refresh display with current params refreshDrawableState(); + // Default state is derived from on/off-text, so state has to be updated when on/off-text + // are updated. + setDefaultStateDescritption(); setChecked(isChecked()); } diff --git a/core/java/android/widget/ToggleButton.java b/core/java/android/widget/ToggleButton.java index d47405b3b11e..59e0c16cde37 100644 --- a/core/java/android/widget/ToggleButton.java +++ b/core/java/android/widget/ToggleButton.java @@ -58,6 +58,9 @@ public class ToggleButton extends CompoundButton { mTextOff = a.getText(com.android.internal.R.styleable.ToggleButton_textOff); mDisabledAlpha = a.getFloat(com.android.internal.R.styleable.ToggleButton_disabledAlpha, 0.5f); syncTextState(); + // Default state is derived from on/off-text, so state has to be updated when on/off-text + // are updated. + setDefaultStateDescritption(); a.recycle(); } |