commit 38337dc8b8a27f8b565ca96a3779317247066eb8
author Yiling Chuang <emilychuang@google.com> Fri Mar 22 06:39:08 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 22 06:39:08 2024 +0000
tree 0d9a8b4ae3d37640055b486ab89ee643b52e269c
parent fd882624f95a494d63de90d38cafce6e8408320f
parent 21b1efa944dca16932eecb4b8da883a72a6b474d

Merge "Revert "Add a new tip type for wireless charging."" into main

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 1d08617..1345032 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -62,8 +62,7 @@
         TipType.BATTERY_DEFENDER,
         TipType.DOCK_DEFENDER,
         TipType.INCOMPATIBLE_CHARGER,
-        TipType.BATTERY_WARNING,
-        TipType.WIRELESS_CHARGING_WARNING
+        TipType.BATTERY_WARNING
     })
     public @interface TipType {
         int SMART_BATTERY_MANAGER = 0;
@@ -78,7 +77,6 @@
         int DOCK_DEFENDER = 9;
         int INCOMPATIBLE_CHARGER = 10;
         int BATTERY_WARNING = 11;
-        int WIRELESS_CHARGING_WARNING = 12;
     }
 
     @VisibleForTesting static final SparseIntArray TIP_ORDER;
@@ -97,7 +95,6 @@
         TIP_ORDER.append(TipType.REDUCED_BATTERY, 9);
         TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 10);
         TIP_ORDER.append(TipType.BATTERY_WARNING, 11);
-        TIP_ORDER.append(TipType.WIRELESS_CHARGING_WARNING, 12);
     }
 
     private static final String KEY_PREFIX = "key_battery_tip";