Merge \"Notification: Apply small icon level\" into nyc-mr1-dev

am: 9d8de73530 Change-Id: Iac5f0b6e210355867f79cbc7f48165517ba11a26
2016-07-15 21:16:41 +00:00
parent 119840eb91 9d8de73530
commit 8b942b2404
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3474,6 +3474,8 @@ public class Notification implements Parcelable
                mN.mSmallIcon = Icon.createWithResource(mContext, mN.icon);
            }
            contentView.setImageViewIcon(R.id.icon, mN.mSmallIcon);
+            contentView.setDrawableParameters(R.id.icon, false /* targetBackground */,
+                    -1 /* alpha */, -1 /* colorFilter */, null /* mode */, mN.iconLevel);
            processSmallIconColor(mN.mSmallIcon, contentView);
        }