Merge "Fix bug #15115542 Ripple effect is crashing Settings with java.lang.NullPointerException"

This commit is contained in:
Fabrice Di Meglio
2014-05-21 21:02:30 +00:00
committed by Android (Google) Code Review

View File

@@ -144,7 +144,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
}
private Drawable getHighlightDrawable() {
return getResources().getDrawable(R.drawable.preference_highlight);
return getActivity().getDrawable(R.drawable.preference_highlight);
}
/**