From 18bbc6a013e10b1fe384b7d3798622e087c813d2 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Tue, 3 Jun 2014 21:43:24 -0700 Subject: Adding workaround for issue with null drawable A drawable is null which ought not be null, since it should have been set during inflation. Seems like a platform issue on one device. Adding a workaround to manually set it in code after inflation if necessary. issue 15334203 Change-Id: Ideb80c231300e61f6dfe5336d6d647a3e1b51817 --- src/com/android/launcher3/InfoDropTarget.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java index 374238c49..fb623ca1e 100644 --- a/src/com/android/launcher3/InfoDropTarget.java +++ b/src/com/android/launcher3/InfoDropTarget.java @@ -49,6 +49,13 @@ public class InfoDropTarget extends ButtonDropTarget { Resources r = getResources(); mHoverColor = r.getColor(R.color.info_target_hover_tint); mDrawable = (TransitionDrawable) getCurrentDrawable(); + + if (mDrawable == null) { + // TODO: investigate why this is ever happening. Presently only on one known device. + mDrawable = r.getDrawable(R.drawable.info_target_selector); + setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null); + } + if (null != mDrawable) { mDrawable.setCrossFadeEnabled(true); } -- cgit v1.2.3