diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 96578ef9d5dba..6cb48db10590c 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4528,6 +4528,9 @@ true + + false + false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 4aca6c8b7cefe..0cb8062f81a86 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2363,6 +2363,7 @@ + diff --git a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java index 0002ae95f4761..370628c0b09b7 100644 --- a/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java @@ -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