diff options
| author | John Spurlock <jspurlock@google.com> | 2014-06-20 17:02:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-20 00:24:32 +0000 |
| commit | ffb943917299bf10366cbf849ba8df378ecab53c (patch) | |
| tree | 271e9646eed564aee62974bddb5150991eb32d2d | |
| parent | eff9661b2a6ca3e80b7fa8be7915b661ace15069 (diff) | |
| parent | e599488968f41cf7ad7f6b0fbdc3ce37213e38da (diff) | |
Merge "If we're not showing switch text, don't include in measure."
| -rw-r--r-- | core/java/android/widget/Switch.java | 4 |
1 files 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, |