Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38337dc8 authored by Yiling Chuang's avatar Yiling Chuang Committed by Android (Google) Code Review
Browse files

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

parents fd882624 21b1efa9

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

+1 −4
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        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 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        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 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        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";