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

Commit cf4c8c70 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010532'] into 25Q2-release. 

Change-Id: I17b7fe4e4196befdd6df7ef7de0a774032f04602
parents 0fb38ed8 9fca47cb

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

+16 −13
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        TipType.BATTERY_DEFENDER,

        TipType.DOCK_DEFENDER,

        TipType.INCOMPATIBLE_CHARGER,

        TipType.BATTERY_WARNING

        TipType.BATTERY_WARNING,

        TipType.BATTERY_HEALTH

    })

    public @interface TipType {

        int SMART_BATTERY_MANAGER = 0;
@@ -78,24 +79,26 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        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_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);

        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);

    }



    private static final String KEY_PREFIX = "key_battery_tip";