Update battery tip main icon into materiel theme design am: ff65a02ff8 am: a756df402f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: Ic0cad0444c3d895334e972947b271dbe53687625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
ykhung
2023-04-20 20:53:19 +00:00
committed by Automerger Merge Worker
12 changed files with 48 additions and 33 deletions

View File

@@ -55,7 +55,7 @@ public class BatteryDefenderTip extends BatteryTip {
@Override
public int getIconId() {
return R.drawable.ic_battery_status_good_24dp;
return R.drawable.ic_battery_status_good_theme;
}
@Override

View File

@@ -71,7 +71,7 @@ public class HighUsageTip extends BatteryTip {
@Override
public int getIconId() {
return R.drawable.ic_perm_device_information_red_24dp;
return R.drawable.ic_perm_device_information_theme;
}
@Override

View File

@@ -48,7 +48,7 @@ public final class IncompatibleChargerTip extends BatteryTip {
@Override
public int getIconId() {
return R.drawable.ic_battery_alert_24dp;
return R.drawable.ic_battery_alert_theme;
}
@Override

View File

@@ -51,12 +51,7 @@ public class LowBatteryTip extends BatteryTip {
@Override
public int getIconId() {
return mState = R.drawable.ic_battery_status_bad_24dp;
}
@Override
public int getIconTintColorId() {
return mState = R.color.battery_bad_color_light;
return mState = R.drawable.ic_battery_saver_accent_24dp;
}
@Override

View File

@@ -93,8 +93,8 @@ public class RestrictAppTip extends BatteryTip {
@Override
public int getIconId() {
return mState == StateType.HANDLED
? R.drawable.ic_perm_device_information_green_24dp
: R.drawable.ic_battery_alert_24dp;
? R.drawable.ic_perm_device_information_theme
: R.drawable.ic_battery_alert_theme;
}
@Override

View File

@@ -48,7 +48,7 @@ public class SmartBatteryTip extends BatteryTip {
@Override
public int getIconId() {
return R.drawable.ic_perm_device_information_red_24dp;
return R.drawable.ic_perm_device_information_theme;
}
@Override