From e599488968f41cf7ad7f6b0fbdc3ce37213e38da Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Fri, 20 Jun 2014 10:53:54 -0400 Subject: If we're not showing switch text, don't include in measure. Naive fix for switch crashes when !showText. Bug:15770311 Change-Id: I68839b61b907d62159e2c12349005683e9ac6436 --- core/java/android/widget/Switch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 5b8e8549fd4d..9a8380d70c28 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -570,8 +570,8 @@ public class Switch extends CompoundButton { mTrackDrawable.getPadding(mTempRect); - final int maxTextWidth = Math.max(mOnLayout.getWidth(), mOffLayout.getWidth()) - + mThumbTextPadding * 2; + final int maxTextWidth = mShowText ? Math.max(mOnLayout.getWidth(), mOffLayout.getWidth()) + + mThumbTextPadding * 2 : 0; mThumbWidth = Math.max(maxTextWidth, mThumbDrawable.getIntrinsicWidth()); final int switchWidth = Math.max(mSwitchMinWidth, -- cgit v1.2.3-59-g8ed1b