commit 77e399335e456acee4932ac0a120d93bd457b438
author Evan Laird <evanlaird@google.com> Thu Jun 21 14:58:14 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 21 14:58:14 2018 -0700
tree dfa6ae81c3285fb35cd6a17d6b7fb64eed34e4d9
parent 626972bada8facac262be6cd4eb06e5657d0113c
parent 1f6c7910fbfd1b023ccdd517b28e75f21de89841

Merge "Allow config to disable battery percent setting" into pi-dev
am: 1f6c7910fb

Change-Id: Ief7df5312104e44bda140f68dd5e6821c2736bbf

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

diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
index 4493158..be676e3 100644
--- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java
+++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
@@ -20,6 +20,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v14.preference.SwitchPreference;
 
+import com.android.internal.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -40,7 +41,8 @@
 
     @Override
     public boolean isAvailable() {
-        return true;
+        return mContext.getResources()
+                .getBoolean(R.bool.config_battery_percentage_setting_available);
     }
 
     @Override