Merge "Remove the legacy EarlyWarning tip mechanism to improve performance" (ea0b1a99) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -91,15 +91,6 @@ public interface PowerUsageFeatureProvider {
		*/
		String getOldEstimateDebugString(String timeRemaining);

		/**
		* Returns a signal to indicate if the device will need to warn the user they may not make it
		* to their next charging time.
		*
		* @param id Optional string used to identify the caller for metrics. Usually the class name of
		* the caller
		*/
		boolean getEarlyWarningSignal(Context context, String id);

		/**
		* Checks whether smart battery feature is supported in this device
		*/

src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -110,11 +110,6 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
		return null;
		}

		@Override
		public boolean getEarlyWarningSignal(Context context, String id) {
		return false;
		}

		@Override
		public boolean isSmartBatterySupported() {
		return mContext.getResources().getBoolean(

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import com.android.settings.fuelgauge.BatteryInfo;
		import com.android.settings.fuelgauge.BatteryUtils;
		import com.android.settings.fuelgauge.batterytip.detectors.BatteryDefenderDetector;
		import com.android.settings.fuelgauge.batterytip.detectors.DockDefenderDetector;
		import com.android.settings.fuelgauge.batterytip.detectors.EarlyWarningDetector;
		import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector;
		import com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetector;
		import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector;
		@@ -72,7 +71,6 @@ public class BatteryTipLoader extends AsyncLoaderCompat<List<BatteryTip>> {
		tips.add(new HighUsageDetector(context, policy, mBatteryUsageStats, batteryInfo).detect());
		tips.add(new SmartBatteryDetector(
		context, policy, batteryInfo, context.getContentResolver()).detect());
		tips.add(new EarlyWarningDetector(policy, context).detect());
		tips.add(new BatteryDefenderDetector(
		batteryInfo, context.getApplicationContext()).detect());
		tips.add(new DockDefenderDetector(batteryInfo, context.getApplicationContext()).detect());

src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java

deleted100644 → 0

+0 −65

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.fuelgauge.batterytip.detectors;

		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.os.BatteryManager;
		import android.os.PowerManager;

		import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
		import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
		import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
		import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip;
		import com.android.settings.overlay.FeatureFactory;

		/**
		* Detector whether to early warning tip.
		*/
		public class EarlyWarningDetector implements BatteryTipDetector {
		private BatteryTipPolicy mPolicy;
		private PowerManager mPowerManager;
		private Context mContext;
		private PowerUsageFeatureProvider mPowerUsageFeatureProvider;

		public EarlyWarningDetector(BatteryTipPolicy policy, Context context) {
		mPolicy = policy;
		mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
		mContext = context;
		mPowerUsageFeatureProvider = FeatureFactory.getFactory(
		context).getPowerUsageFeatureProvider(context);
		}

		@Override
		public BatteryTip detect() {
		final Intent batteryBroadcast = mContext.registerReceiver(null,
		new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
		final boolean discharging =
		batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
		final boolean powerSaveModeOn = mPowerManager.isPowerSaveMode();
		final boolean earlyWarning = mPowerUsageFeatureProvider.getEarlyWarningSignal(mContext,
		EarlyWarningDetector.class.getName()) \|\| mPolicy.testBatterySaverTip;

		final int state = powerSaveModeOn
		? BatteryTip.StateType.INVISIBLE
		: mPolicy.batterySaverTipEnabled && discharging && earlyWarning
		? BatteryTip.StateType.NEW
		: BatteryTip.StateType.INVISIBLE;
		return new EarlyWarningTip(state, powerSaveModeOn);
		}
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import java.util.List;
		public class BatteryTipLoaderTest {

		private static final int[] TIP_ORDER = {
		BatteryTip.TipType.BATTERY_SAVER,
		BatteryTip.TipType.LOW_BATTERY,
		BatteryTip.TipType.BATTERY_DEFENDER,
		BatteryTip.TipType.DOCK_DEFENDER,