PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Battery Fix slice can not displayed" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-30 21:48:22 +00:00
committed by Android (Google) Code Review
parent c824a0cb82 f34d143d0c
commit 9f7485897e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
View File

@@ -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(),