Merge "If we're not showing switch text, don't include in measure."

2014-06-20 17:02:12 +00:00
parent eff9661b2a e599488968
commit ffb9439172
1 changed files with 2 additions and 2 deletions
--- 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,