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

Commit 0886e908 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove High usage battery tip from Settings homepage." into rvc-dev

parents 425f8d23 3e9fb7c7

src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java

+2 −0
Original line number Diff line number Diff line
@@ -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));

    }

tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java

+8 −0
Original line number Diff line number Diff line
@@ -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<BatteryTip> tips = new ArrayList<>();

        final List<AppInfo> 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);