Merge "Set default value of battery percent preference" am: 145caf7d4e

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

Change-Id: I34fe8a73fb89283e44dd46c9c655f8db9353e41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/display/BatteryPercentagePreferenceController.java

@@ -67,7 +67,9 @@ public class BatteryPercentagePreferenceController extends BasePreferenceControl
     @Override
     public void updateState(Preference preference) {
         int setting = Settings.System.getInt(mContext.getContentResolver(),
-                SHOW_BATTERY_PERCENT, 0);
+                SHOW_BATTERY_PERCENT,
+                mContext.getResources().getBoolean(
+                R.bool.config_defaultBatteryPercentageSetting) ? 1 : 0);
 
         ((SwitchPreference) preference).setChecked(setting == 1);
     }