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

Commit 2aff060a authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

Merge "Remove the legacy smart battery tip from Settings" into udc-dev

parents 7a7193c8 2f42eb20

src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java

+0 −3
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ public class BatteryTipLoader extends AsyncLoaderCompat<List<BatteryTip>> { 


        tips.add(new LowBatteryDetector(context, policy, batteryInfo, isPowerSaveMode).detect());

        tips.add(new HighUsageDetector(context, policy, mBatteryUsageStats, batteryInfo).detect());

        tips.add(new SmartBatteryDetector(

                context, policy, batteryInfo, context.getContentResolver(), isPowerSaveMode)

                        .detect());

        tips.add(new BatteryDefenderDetector(batteryInfo, context).detect());

        tips.add(new DockDefenderDetector(batteryInfo, context).detect());

        tips.add(new IncompatibleChargerDetector(context).detect());

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

+1 −2
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ public class BatteryTipLoaderTest { 
            BatteryTip.TipType.BATTERY_DEFENDER,

            BatteryTip.TipType.DOCK_DEFENDER,

            BatteryTip.TipType.INCOMPATIBLE_CHARGER,

            BatteryTip.TipType.HIGH_DEVICE_USAGE,

            BatteryTip.TipType.SMART_BATTERY_MANAGER};

            BatteryTip.TipType.HIGH_DEVICE_USAGE};

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private BatteryUsageStats mBatteryUsageStats;

    @Mock