Merge "Reorder battery tips priority" into sc-dev
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index 3b849be..5aee029 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -75,11 +75,11 @@
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);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
index 5d7b082..95280b6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -50,10 +50,10 @@
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;