diff options
author | Adam Cohen <adamcohen@google.com> | 2014-06-04 05:09:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 05:09:37 +0000 |
commit | 8739de663cb29fcf3bd8ad7322eb35b2bea20fb6 (patch) | |
tree | dde7f2cc2df33a6a6e18bee546dd695d3904bc3a /src/com | |
parent | 6bd73154c5f79208aa0fc3ea987847f0b465d319 (diff) | |
parent | 18bbc6a013e10b1fe384b7d3798622e087c813d2 (diff) | |
download | android_packages_apps_Trebuchet-8739de663cb29fcf3bd8ad7322eb35b2bea20fb6.tar.gz android_packages_apps_Trebuchet-8739de663cb29fcf3bd8ad7322eb35b2bea20fb6.tar.bz2 android_packages_apps_Trebuchet-8739de663cb29fcf3bd8ad7322eb35b2bea20fb6.zip |
am 18bbc6a0: Adding workaround for issue with null drawable
* commit '18bbc6a013e10b1fe384b7d3798622e087c813d2':
Adding workaround for issue with null drawable
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/InfoDropTarget.java | 7 |
1 files changed, 7 insertions, 0 deletions
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); } |