Merge "[Battery usage U] Remove 'Phone Idle' to avoid confusion" (fec083b2) · Commits · e / os / android_packages_apps_Settings

res-product/values/strings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -551,10 +551,6 @@
		<string name="battery_tip_dialog_summary_message" product="device">Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery.</string>
		<!-- Summary for the smart battery toggle [CHAR LIMIT=NONE] -->
		<string name="smart_battery_summary" product="default">Limit battery for apps that you don\u2019t use often</string>
		<!-- Label for power consumed when Idle -->
		<string name="power_idle" product="tablet">Tablet idle</string>
		<!-- Label for power consumed when Idle -->
		<string name="power_idle" product="default">Phone idle</string>
		<!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
		<string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone charges above <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>
		<!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2022 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="48dp"
		android:height="48dp"
		android:viewportWidth="48"
		android:viewportHeight="48"
		android:tint="@color/battery_usage_system_icon_color">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M14,48h4v-4h-4v4zM22,48h4v-4h-4v4zM26,4h-4v20h4L26,4zM33.13,8.87l-2.89,2.89C33.69,13.87 36,17.66 36,22c0,6.63 -5.37,12 -12,12s-12,-5.37 -12,-12c0,-4.34 2.31,-8.13 5.76,-10.24l-2.89,-2.89C10.72,11.76 8,16.56 8,22c0,8.84 7.16,16 16,16s16,-7.16 16,-16c0,-5.44 -2.72,-10.24 -6.87,-13.13zM30,48h4v-4h-4v4z"/>
		</vector>

+7 −2

Original line number	Diff line number	Diff line
		@@ -146,15 +146,20 @@ public interface PowerUsageFeatureProvider {
		Intent getResumeChargeIntent(boolean isDockDefender);

		/**
		* Returns {@link Set} for hiding applications background usage time.
		* Returns {@link Set} for hiding system component ids in the usage screen.
		*/
		Set<CharSequence> getHideBackgroundUsageTimeSet(Context context);
		Set<Integer> getHideSystemComponentSet(Context context);

		/**
		* Returns {@link Set} for hiding application package names in the usage screen.
		*/
		Set<CharSequence> getHideApplicationSet(Context context);

		/**
		* Returns {@link Set} for hiding applications background usage time.
		*/
		Set<CharSequence> getHideBackgroundUsageTimeSet(Context context);

		/**
		* Returns {@link Set} for ignoring task root class names for screen on time.
		*/

+6 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
		}

		@Override
		public Set<CharSequence> getHideBackgroundUsageTimeSet(Context context) {
		public Set<Integer> getHideSystemComponentSet(Context context) {
		return new ArraySet<>();
		}

		@@ -171,6 +171,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
		return new ArraySet<>();
		}

		@Override
		public Set<CharSequence> getHideBackgroundUsageTimeSet(Context context) {
		return new ArraySet<>();
		}

		@Override
		public Set<CharSequence> getIgnoreScreenOnTimeTaskRootSet(Context context) {
		return new ArraySet<>();

+0 −5

Original line number	Diff line number	Diff line
		@@ -590,11 +590,6 @@ public class BatteryEntry {
		name = context.getResources().getString(R.string.power_wifi);
		iconId = R.drawable.ic_settings_wireless_no_theme;
		break;
		case BatteryConsumer.POWER_COMPONENT_IDLE:
		case BatteryConsumer.POWER_COMPONENT_MEMORY:
		name = context.getResources().getString(R.string.power_idle);
		iconId = R.drawable.ic_settings_phone_idle;
		break;
		default:
		Log.w(TAG, "unknown attribute:" + DebugUtils.constantToString(
		BatteryConsumer.class, "POWER_COMPONENT_", powerComponentId));