Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set default battery percentage in SystemUI" am: 196a350162

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1719595

Change-Id: If5268575ba4442b7552b2593bab89ebd65c89894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Laird
2023-05-09 16:37:48 +00:00
committed by Automerger Merge Worker
parent 35424cbfc1 196a350162
commit 612e8e5ce6
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -4528,6 +4528,9 @@
<!-- Whether or not we should show the option to show battery percentage -->
<bool name="config_battery_percentage_setting_available">true</bool>
<!-- Default value set for battery percentage in status bar false = disabled, true = enabled -->
<bool name="config_defaultBatteryPercentageSetting">false</bool>
<!-- Whether or not battery saver should be "sticky" when manually enabled. -->
<bool name="config_batterySaverStickyBehaviourDisabled">false</bool>

1
core/res/res/values/symbols.xml
View File

@@ -2363,6 +2363,7 @@
<java-symbol type="style" name="Animation.RecentApplications" />
<java-symbol type="integer" name="dock_enter_exit_duration" />
<java-symbol type="bool" name="config_battery_percentage_setting_available" />
<java-symbol type="bool" name="config_defaultBatteryPercentageSetting" />
<java-symbol type="string" name="nas_upgrade_notification_title" />
<java-symbol type="string" name="nas_upgrade_notification_content" />
<java-symbol type="string" name="nas_upgrade_notification_enable_action" />

4
packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java
View File

@@ -331,7 +331,9 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver {
// TODO(b/140051051)
final boolean systemSetting = 0 != whitelistIpcs(() -> Settings.System
.getIntForUser(getContext().getContentResolver(),
SHOW_BATTERY_PERCENT, 0, UserHandle.USER_CURRENT));
SHOW_BATTERY_PERCENT, getContext().getResources().getBoolean(
com.android.internal.R.bool.config_defaultBatteryPercentageSetting)
? 1 : 0, UserHandle.USER_CURRENT));
boolean shouldShow =
(mShowPercentAvailable && systemSetting && mShowPercentMode != MODE_OFF)
|| mShowPercentMode == MODE_ON