commit ab7dc7c1ce6d12c0dec5f9c4ed3f5c63c5a87589
author Kris Giesing <kgiesing@google.com> Mon Mar 23 16:19:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 23 16:21:13 2015 +0000
tree 275dedfb20400785d93bbb6e8ca833e68cfb8c5e
parent 70e4708f98dedbbf77f46db9a2220710a5b439e6
parent 162b21598d9f4fd49748b3c7e27501fe1277210d

Merge "Copy the drawable's level to the image view"

v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java

diff --git a/v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java b/v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java
index 3562234..204d4ce 100644
--- a/v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java
+++ b/v17/leanback/src/android/support/v17/leanback/widget/GuidedActionsStylist.java
@@ -528,6 +528,8 @@
             Context context = iconView.getContext();
             icon = action.getIcon();
             if (icon != null) {
+                // setImageDrawable resets the drawable's level unless we set the view level first.
+                iconView.setImageLevel(icon.getLevel());
                 iconView.setImageDrawable(icon);
                 iconView.setVisibility(View.VISIBLE);
             } else {