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

Commit 6f0a0da4 authored by Wesley Wang's avatar Wesley Wang Committed by Android (Google) Code Review
Browse files

Merge "Reorder battery tips priority" into sc-dev

parents 8c655662 d081de87

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

+5 −5
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
    static final SparseIntArray TIP_ORDER;

    static {

        TIP_ORDER = new SparseIntArray();

        TIP_ORDER.append(TipType.BATTERY_DEFENDER, 0);

        TIP_ORDER.append(TipType.APP_RESTRICTION, 1);

        TIP_ORDER.append(TipType.BATTERY_SAVER, 2);

        TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 3);

        TIP_ORDER.append(TipType.LOW_BATTERY, 4);

        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.APP_RESTRICTION, 3);

        TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 4);

        TIP_ORDER.append(TipType.SUMMARY, 5);

        TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 6);

        TIP_ORDER.append(TipType.REDUCED_BATTERY, 7);

tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java

+2 −2
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ import java.util.List; 
public class BatteryTipLoaderTest {



    private static final int[] TIP_ORDER = {

            BatteryTip.TipType.BATTERY_DEFENDER,

            BatteryTip.TipType.BATTERY_SAVER,

            BatteryTip.TipType.HIGH_DEVICE_USAGE,

            BatteryTip.TipType.LOW_BATTERY,

            BatteryTip.TipType.BATTERY_DEFENDER,

            BatteryTip.TipType.HIGH_DEVICE_USAGE,

            BatteryTip.TipType.SMART_BATTERY_MANAGER};

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private BatteryUsageStats mBatteryUsageStats;