Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev

Browse Source 
* commit '8872465709d336083a908cb79d08661c6658265b':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
This commit is contained in:
Fabrice Di Meglio
2012-09-12 13:29:27 -07:00
committed by Android Git Automerger
parent 215ce60a40 8872465709
commit 47e39a9f61
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/widget/Switch.java
View File

@@ -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();
}