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

Merge "Tint battery fix icon" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-16 16:25:34 +00:00
committed by Android (Google) Code Review
parent 957da73a7d 006582b48e
commit 77c56714ed
3 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
View File

@@ -160,7 +160,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
}
/** Returns the color resid for tinting {@link #getIconId()} or {@link View#NO_ID} if none. */
protected @IdRes int getIconTintColorId() {
public @IdRes int getIconTintColorId() {
return View.NO_ID;
}

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

@@ -25,6 +25,9 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.util.ArrayMap;
@@ -39,6 +42,7 @@ import androidx.slice.builders.SliceAction;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.fuelgauge.batterytip.BatteryTipLoader;
@@ -107,8 +111,12 @@ public class BatteryFixSlice implements CustomSliceable {
if (batteryTip.getState() == BatteryTip.StateType.INVISIBLE) {
continue;
}
final IconCompat icon = IconCompat.createWithResource(mContext,
batteryTip.getIconId());
final Drawable drawable = mContext.getDrawable(batteryTip.getIconId());
drawable.setColorFilter(new PorterDuffColorFilter(
mContext.getResources().getColor(batteryTip.getIconTintColorId()),
PorterDuff.Mode.SRC_IN));
final IconCompat icon = Utils.createIconWithDrawable(drawable);
final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(),
icon,
ListBuilder.ICON_IMAGE,