diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java index 3cd4ca3deec..d99d01ed780 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java @@ -73,6 +73,8 @@ public class BatteryFixSlice implements CustomSliceable { UNIMPORTANT_BATTERY_TIPS = new ArrayMap<>(); UNIMPORTANT_BATTERY_TIPS.put(BatteryTip.TipType.SUMMARY, Arrays.asList(BatteryTip.StateType.NEW, BatteryTip.StateType.HANDLED)); + UNIMPORTANT_BATTERY_TIPS.put(BatteryTip.TipType.HIGH_DEVICE_USAGE, + Arrays.asList(BatteryTip.StateType.NEW, BatteryTip.StateType.HANDLED)); UNIMPORTANT_BATTERY_TIPS.put(BatteryTip.TipType.BATTERY_SAVER, Arrays.asList(BatteryTip.StateType.HANDLED)); } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java index 8fad638eeaa..68c97cfd0d4 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java @@ -32,9 +32,11 @@ import androidx.slice.widget.SliceLiveData; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryStatsHelperLoader; +import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryTipLoader; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip; +import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; import com.android.settings.slices.SliceBackgroundWorker; @@ -95,8 +97,14 @@ public class BatteryFixSliceTest { @Test public void getSlice_unimportantSlice_shouldSkip() { final List tips = new ArrayList<>(); + final List appList = new ArrayList<>(); + appList.add(new AppInfo.Builder() + .setPackageName("com.android.settings") + .setScreenOnTimeMs(10000L) + .build()); tips.add(new LowBatteryTip(BatteryTip.StateType.INVISIBLE, false, "")); tips.add(new EarlyWarningTip(BatteryTip.StateType.HANDLED, false)); + tips.add(new HighUsageTip(1000L, appList)); ShadowBatteryTipLoader.setBatteryTips(tips); BatteryFixSlice.refreshBatteryTips(mContext);