diff --git a/res/drawable/ic_check_circle_green_24dp.xml b/res/drawable/ic_arrow_back.xml similarity index 56% rename from res/drawable/ic_check_circle_green_24dp.xml rename to res/drawable/ic_arrow_back.xml index 6f2692ddbbc..374f16b6f1b 100644 --- a/res/drawable/ic_check_circle_green_24dp.xml +++ b/res/drawable/ic_arrow_back.xml @@ -1,7 +1,7 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> + android:fillColor="@android:color/white" + android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" /> diff --git a/res/drawable/ic_battery_status_bad_24dp.xml b/res/drawable/ic_battery_status_bad_24dp.xml index d841f08a218..584c3b66e14 100644 --- a/res/drawable/ic_battery_status_bad_24dp.xml +++ b/res/drawable/ic_battery_status_bad_24dp.xml @@ -19,9 +19,9 @@ Copyright (C) 2018 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_battery_status_good_24dp.xml b/res/drawable/ic_battery_status_good_24dp.xml index 4628ee588c9..600d4c97f47 100644 --- a/res/drawable/ic_battery_status_good_24dp.xml +++ b/res/drawable/ic_battery_status_good_24dp.xml @@ -19,9 +19,9 @@ Copyright (C) 2018 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_battery_status_maybe_24dp.xml b/res/drawable/ic_battery_status_maybe_24dp.xml index 64451be7304..dd9a57129af 100644 --- a/res/drawable/ic_battery_status_maybe_24dp.xml +++ b/res/drawable/ic_battery_status_maybe_24dp.xml @@ -19,9 +19,9 @@ Copyright (C) 2018 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_cellular_1_bar.xml b/res/drawable/ic_cellular_1_bar.xml index b3d2624fa27..23caacc2244 100644 --- a/res/drawable/ic_cellular_1_bar.xml +++ b/res/drawable/ic_cellular_1_bar.xml @@ -13,17 +13,17 @@ See the License for the specific language governing permissions and limitations under the License. --> + - - - + + + \ No newline at end of file diff --git a/res/drawable/ic_devices_other_black.xml b/res/drawable/ic_devices_other_black.xml deleted file mode 100644 index 926f02cd00f..00000000000 --- a/res/drawable/ic_devices_other_black.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/drawable/ic_hotspot.xml b/res/drawable/ic_hotspot.xml index d8528ddc4db..6c12ed19b20 100644 --- a/res/drawable/ic_hotspot.xml +++ b/res/drawable/ic_hotspot.xml @@ -15,48 +15,17 @@ limitations under the License. --> - - - - - - - - - - - - - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + + + \ No newline at end of file diff --git a/res/drawable/ic_settings_home.xml b/res/drawable/ic_settings_home.xml index 1cc959347c8..3de5f14ce90 100644 --- a/res/drawable/ic_settings_home.xml +++ b/res/drawable/ic_settings_home.xml @@ -21,5 +21,4 @@ android:tint="?android:attr/colorControlNormal"> - diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml index dc92de06c6c..41f3a24fd53 100644 --- a/res/drawable/ic_settings_print.xml +++ b/res/drawable/ic_settings_print.xml @@ -15,8 +15,14 @@ limitations under the License. --> - - \ No newline at end of file + + + + diff --git a/res/values/attrs.xml b/res/values/attrs.xml index a9797a3508c..be6345bd6a8 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -166,10 +166,6 @@ - - - - diff --git a/res/values/themes.xml b/res/values/themes.xml index 59b2b9eec1c..196e85beec6 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -28,6 +28,7 @@ diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index 54eb913a308..55bb9b2e83d 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -16,11 +16,14 @@ package com.android.settings.fuelgauge.batterytip.tips; +import android.annotation.Nullable; import android.content.Context; +import android.content.res.ColorStateList; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseIntArray; +import androidx.annotation.ColorInt; import androidx.annotation.IdRes; import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; @@ -151,6 +154,15 @@ public abstract class BatteryTip implements Comparable, Parcelable { preference.setTitle(getTitle(context)); preference.setSummary(getSummary(context)); preference.setIcon(getIconId()); + ColorStateList tint = getIconTint(); + if (tint != null) { + preference.getIcon().setTintList(tint); + } + } + + /** Returns the {@link ColorStateList} for tinting {@link #getIconId()} or null if none. */ + protected @Nullable ColorStateList getIconTint() { + return null; } public boolean shouldShowDialog() { diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java index 7674c095f82..fe06507d34a 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.app.settings.SettingsEnums; import android.content.Context; +import android.content.res.ColorStateList; import android.os.Parcel; import com.android.settings.R; @@ -62,6 +63,13 @@ public class EarlyWarningTip extends BatteryTip { : R.drawable.ic_battery_status_bad_24dp; } + @Override + public ColorStateList getIconTint() { + return ColorStateList.valueOf(mState == StateType.HANDLED + ? R.color.battery_maybe_color_light + : R.color.battery_bad_color_light); + } + @Override public void updateState(BatteryTip tip) { final EarlyWarningTip earlyWarningTip = (EarlyWarningTip) tip; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java index aec6456c50d..c21df2c02f4 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.app.settings.SettingsEnums; import android.content.Context; +import android.content.res.ColorStateList; import android.os.Parcel; import android.os.Parcelable; @@ -58,6 +59,11 @@ public class SummaryTip extends BatteryTip { return R.drawable.ic_battery_status_good_24dp; } + @Override + public ColorStateList getIconTint() { + return ColorStateList.valueOf(R.color.battery_good_color_light); + } + @Override public void updateState(BatteryTip tip) { mState = tip.mState;