commit e1c2d09e01cc9c5576db28f8acb10f3644099737
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 23 13:45:11 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 23 13:45:11 2025 -0700
tree fa9251600ee58bc83f789ad63c6341d995e5d2d3
parent 12ea1a89e5f40413fe36e0c4b8191e541e6e60b2
parent b4a412b3d553cbb52f056a915411e318ed6ba67e

[coastguard skipped] Merge sparse cherrypicks from sparse-13392877-L45400030011494577 into 25Q2-release.

COASTGUARD_SKIP: I37f1895c1092f45f91089c36b3b4409dde3e691c
COASTGUARD_SKIP: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc

Change-Id: I5a50b50be0a87b01a1d93b40ee1f3d20e80c6a08

src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java

diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index f263884..1f5374d 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -63,8 +63,7 @@
         TipType.BATTERY_DEFENDER,
         TipType.DOCK_DEFENDER,
         TipType.INCOMPATIBLE_CHARGER,
-        TipType.BATTERY_WARNING,
-        TipType.BATTERY_HEALTH
+        TipType.BATTERY_WARNING
     })
     public @interface TipType {
         int SMART_BATTERY_MANAGER = 0;
@@ -79,26 +78,24 @@
         int DOCK_DEFENDER = 9;
         int INCOMPATIBLE_CHARGER = 10;
         int BATTERY_WARNING = 11;
-        int BATTERY_HEALTH = 12;
     }
 
     @VisibleForTesting static final SparseIntArray TIP_ORDER;
 
     static {
         TIP_ORDER = new SparseIntArray();
-        TIP_ORDER.append(TipType.BATTERY_HEALTH, 0);
-        TIP_ORDER.append(TipType.BATTERY_SAVER, 1);
-        TIP_ORDER.append(TipType.LOW_BATTERY, 2);
-        TIP_ORDER.append(TipType.BATTERY_DEFENDER, 3);
-        TIP_ORDER.append(TipType.DOCK_DEFENDER, 4);
-        TIP_ORDER.append(TipType.INCOMPATIBLE_CHARGER, 5);
-        TIP_ORDER.append(TipType.APP_RESTRICTION, 6);
-        TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 7);
-        TIP_ORDER.append(TipType.SUMMARY, 8);
-        TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 9);
-        TIP_ORDER.append(TipType.REDUCED_BATTERY, 10);
-        TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 11);
-        TIP_ORDER.append(TipType.BATTERY_WARNING, 12);
+        TIP_ORDER.append(TipType.BATTERY_SAVER, 0);
+        TIP_ORDER.append(TipType.LOW_BATTERY, 1);
+        TIP_ORDER.append(TipType.BATTERY_DEFENDER, 2);
+        TIP_ORDER.append(TipType.DOCK_DEFENDER, 3);
+        TIP_ORDER.append(TipType.INCOMPATIBLE_CHARGER, 4);
+        TIP_ORDER.append(TipType.APP_RESTRICTION, 5);
+        TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 6);
+        TIP_ORDER.append(TipType.SUMMARY, 7);
+        TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 8);
+        TIP_ORDER.append(TipType.REDUCED_BATTERY, 9);
+        TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 10);
+        TIP_ORDER.append(TipType.BATTERY_WARNING, 11);
     }
 
     private static final String KEY_PREFIX = "key_battery_tip";