diff options
| -rw-r--r-- | core/java/android/widget/Switch.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 1f713d4469a3..689bd02fbe16 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -750,10 +750,11 @@ public class Switch extends CompoundButton { mTextPaint.drawableState = getDrawableState(); Layout switchText = getTargetCheckedState() ? mOnLayout : mOffLayout; - - canvas.translate((thumbLeft + thumbRight) / 2 - switchText.getWidth() / 2, - (switchInnerTop + switchInnerBottom) / 2 - switchText.getHeight() / 2); - switchText.draw(canvas); + if (switchText != null) { + canvas.translate((thumbLeft + thumbRight) / 2 - switchText.getWidth() / 2, + (switchInnerTop + switchInnerBottom) / 2 - switchText.getHeight() / 2); + switchText.draw(canvas); + } canvas.restore(); } |