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

Merge "Fix for NPE in Switch"

Browse Source
This commit is contained in:
Gilles Debunne
2011-09-02 13:17:13 -07:00
committed by Android (Google) Code Review
parent 016671fb46 e724ee4b04
commit 1737fcd689
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,6 +161,7 @@ public class Switch extends CompoundButton {
mMinFlingVelocity = config.getScaledMinimumFlingVelocity(); mMinFlingVelocity = config.getScaledMinimumFlingVelocity();
// Refresh display with current params // Refresh display with current params
refreshDrawableState();
setChecked(isChecked()); setChecked(isChecked());
} }
@@ -632,8 +633,9 @@ public class Switch extends CompoundButton {
int[] myDrawableState = getDrawableState(); int[] myDrawableState = getDrawableState();
// Set the state of the Drawable // Set the state of the Drawable
mThumbDrawable.setState(myDrawableState); // Drawable may be null when checked state is set from XML, from super constructor
mTrackDrawable.setState(myDrawableState); if (mThumbDrawable != null) mThumbDrawable.setState(myDrawableState);
if (mTrackDrawable != null) mTrackDrawable.setState(myDrawableState);
invalidate(); invalidate();
} }