commit e62270a171e9494b266504ab0d3711a75eecec25
author Wesley Wang <wesleycwwang@google.com> Tue Apr 13 04:27:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 13 04:27:26 2021 +0000
tree aa04aec2072cd241817fa8c6d49dc1c62d0ceb44
parent e51db78711b49e57bf3040f15cef9433e5c951e6
parent 6f0a0da4285f61b2853e61d053c4dd93f627e9e1

Merge "Reorder battery tips priority" into sc-dev am: 6f0a0da428

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14158864

Change-Id: Ic675151a0269f6aa0326e6dd6636e56a7920e49b

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

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

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

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;