From f34d143d0c002464aa9264f1c4cfb736fbdc371c Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Tue, 30 Apr 2019 15:13:12 +0800 Subject: [PATCH] Fix Battery Fix slice can not displayed Fixes: 123174237 Test: manual Change-Id: I3b349a27be5ecffbc64aaccb709c443f6ada875b --- .../contextualcards/slices/BatteryFixSlice.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java index 761755c60fe..d1051fe867a 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java @@ -30,6 +30,7 @@ import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.Drawable; import android.net.Uri; import android.util.ArrayMap; +import android.view.View; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; @@ -112,9 +113,12 @@ public class BatteryFixSlice implements CustomSliceable { continue; } final Drawable drawable = mContext.getDrawable(batteryTip.getIconId()); - drawable.setColorFilter(new PorterDuffColorFilter( - mContext.getResources().getColor(batteryTip.getIconTintColorId()), - PorterDuff.Mode.SRC_IN)); + final int iconTintColorId = batteryTip.getIconTintColorId(); + if (iconTintColorId != View.NO_ID) { + drawable.setColorFilter(new PorterDuffColorFilter( + mContext.getResources().getColor(iconTintColorId), + PorterDuff.Mode.SRC_IN)); + } final IconCompat icon = Utils.createIconWithDrawable(drawable); final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(),