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

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

Browse Source
This commit is contained in:
Yiling Chuang
2024-03-22 06:39:08 +00:00
committed by Android (Google) Code Review
parent fd882624f9 21b1efa944
commit 38337dc8b8
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
TipType.BATTERY_DEFENDER, TipType.BATTERY_DEFENDER,
TipType.DOCK_DEFENDER, TipType.DOCK_DEFENDER,
TipType.INCOMPATIBLE_CHARGER, TipType.INCOMPATIBLE_CHARGER,
TipType.BATTERY_WARNING, TipType.BATTERY_WARNING
TipType.WIRELESS_CHARGING_WARNING
}) })
public @interface TipType { public @interface TipType {
int SMART_BATTERY_MANAGER = 0; int SMART_BATTERY_MANAGER = 0;
@@ -78,7 +77,6 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
int DOCK_DEFENDER = 9; int DOCK_DEFENDER = 9;
int INCOMPATIBLE_CHARGER = 10; int INCOMPATIBLE_CHARGER = 10;
int BATTERY_WARNING = 11; int BATTERY_WARNING = 11;
int WIRELESS_CHARGING_WARNING = 12;
} }
@VisibleForTesting static final SparseIntArray TIP_ORDER; @VisibleForTesting static final SparseIntArray TIP_ORDER;
@@ -97,7 +95,6 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
TIP_ORDER.append(TipType.REDUCED_BATTERY, 9); TIP_ORDER.append(TipType.REDUCED_BATTERY, 9);
TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 10); TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 10);
TIP_ORDER.append(TipType.BATTERY_WARNING, 11); TIP_ORDER.append(TipType.BATTERY_WARNING, 11);
TIP_ORDER.append(TipType.WIRELESS_CHARGING_WARNING, 12);
} }
private static final String KEY_PREFIX = "key_battery_tip"; private static final String KEY_PREFIX = "key_battery_tip";