Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83 am: e4fa9114bd am: f5360f698e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091

Change-Id: I4a6645a663c7e0ee3563ab47513fc7fe8633e90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-18 21:56:36 +00:00
committed by Automerger Merge Worker

View File

@@ -2855,7 +2855,7 @@
android:name="Settings$BatterySaverSettingsActivity" android:name="Settings$BatterySaverSettingsActivity"
android:label="@string/battery_saver" android:label="@string/battery_saver"
android:exported="true" android:exported="true"
android:icon="@drawable/ic_settings_battery"> android:icon="@drawable/ic_homepage_battery">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.BATTERY_SAVER_SETTINGS" /> <action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -2870,6 +2870,7 @@
<activity android:name=".fuelgauge.BatterySaverModeVoiceActivity" <activity android:name=".fuelgauge.BatterySaverModeVoiceActivity"
android:label="@string/power_usage_summary_title" android:label="@string/power_usage_summary_title"
android:icon="@drawable/ic_homepage_battery"
android:theme="@*android:style/Theme.DeviceDefault.Light.Voice" android:theme="@*android:style/Theme.DeviceDefault.Light.Voice"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>