Merge "Cleanup smart battery entries (1/3)" into udc-dev (d9f39001) · Commits · e / os / android_packages_apps_Settings

res/values/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -658,7 +658,7 @@
		<bool name="default_allow_sensitive_lockscreen_content">true</bool>

		<!-- Whether to enable the app battery usage list page feature. -->
		<bool name="config_app_battery_usage_list_enabled">false</bool>
		<bool name="config_app_battery_usage_list_enabled">true</bool>

		<!-- Whether sim related information is visible to the end user. -->
		<bool name="config_show_sim_info">true</bool>

res/xml/power_usage_summary.xml

+1 −8

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 The Android Open Source Project
		<!-- Copyright (C) 2023 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.
		@@ -51,13 +51,6 @@
		settings:keywords="@string/keywords_battery_saver"
		settings:controller="com.android.settings.fuelgauge.BatterySaverController" />

		<Preference
		android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
		android:key="smart_battery_manager"
		android:title="@string/smart_battery_manager_title"
		settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"
		settings:keywords="@string/keywords_battery_adaptive_preferences" />

		<SwitchPreference
		android:key="battery_percentage"
		android:title="@string/battery_percentage"

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -117,16 +117,6 @@ public interface PowerUsageFeatureProvider {
		*/
		boolean isChartGraphSlotsEnabled(Context context);

		/**
		* Checks whether adaptive charging feature is supported in this device
		*/
		boolean isAdaptiveChargingSupported();

		/**
		* Checks whether battery manager feature is supported in this device
		*/
		boolean isBatteryManagerSupported();

		/**
		* Returns {@code true} if current defender mode is extra defend
		*/

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -139,16 +139,6 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
		return false;
		}

		@Override
		public boolean isAdaptiveChargingSupported() {
		return false;
		}

		@Override
		public boolean isBatteryManagerSupported() {
		return true;
		}

		@Override
		public Intent getResumeChargeIntent(boolean isDockDefender) {
		return null;

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

deleted100644 → 0

+0 −85

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;

		import android.app.AppOpsManager;
		import android.content.Context;
		import android.os.UserManager;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.utils.StringUtil;

		/** Preference controller to control the battery manager */
		public class BatteryManagerPreferenceController extends BasePreferenceController {
		private static final String KEY_BATTERY_MANAGER = "smart_battery_manager";

		private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
		private AppOpsManager mAppOpsManager;
		private UserManager mUserManager;
		private boolean mEnableAppBatteryUsagePage;

		public BatteryManagerPreferenceController(Context context) {
		super(context, KEY_BATTERY_MANAGER);
		mPowerUsageFeatureProvider = FeatureFactory.getFactory(
		context).getPowerUsageFeatureProvider(context);
		mAppOpsManager = context.getSystemService(AppOpsManager.class);
		mUserManager = context.getSystemService(UserManager.class);
		mEnableAppBatteryUsagePage =
		mContext.getResources().getBoolean(R.bool.config_app_battery_usage_list_enabled);
		}

		@Override
		public int getAvailabilityStatus() {
		if (!mPowerUsageFeatureProvider.isBatteryManagerSupported()) {
		return UNSUPPORTED_ON_DEVICE;
		}
		if (!mContext.getResources().getBoolean(R.bool.config_battery_manager_consider_ac)) {
		return AVAILABLE_UNSEARCHABLE;
		}
		return mPowerUsageFeatureProvider.isAdaptiveChargingSupported()
		? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
		}

		@Override
		public void updateState(Preference preference) {
		super.updateState(preference);
		if (!mEnableAppBatteryUsagePage) {
		final int num = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager,
		mUserManager).size();
		updateSummary(preference, num);
		}
		}

		@VisibleForTesting
		void updateSummary(Preference preference, int num) {
		if (num > 0) {
		preference.setSummary(StringUtil.getIcuPluralsString(mContext, num,
		R.string.battery_manager_app_restricted));
		} else {
		preference.setSummary(
		mPowerUsageFeatureProvider.isAdaptiveChargingSupported()
		? R.string.battery_manager_summary
		: R.string.battery_manager_summary_unsupported);
		}
		}
		}