From d081de87b825f97ea11aaf5d471da5a44c64316b Mon Sep 17 00:00:00 2001 From: "Wesley.CW Wang" Date: Mon, 12 Apr 2021 17:58:21 +0800 Subject: [PATCH] Reorder battery tips priority - Change the oreder to Battery Low > Defender > High Battery Usage > Adaptive Battery Bug: 177407113 Test: make SettingsRoboTests Change-Id: I7000a0aef30bff90c7aedfd5a43b2229529886e9 --- .../settings/fuelgauge/batterytip/tips/BatteryTip.java | 10 +++++----- .../fuelgauge/batterytip/BatteryTipLoaderTest.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index 3b849be8638..5aee0291e4d 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 @@ public abstract class BatteryTip implements Comparable, 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); 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 5d7b082bd4a..95280b669bc 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 @@ 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;