commit 1f6c7910fbfd1b023ccdd517b28e75f21de89841
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 21 21:18:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 21 21:18:36 2018 +0000
tree 1dafdcb3d69bc5a73edf355e5ae664d058ef3d50
parent e5c1ff17ace405c421df195efe8c3f36fbb0a116
parent 7d9ec632f27b96eb9fa88ecbc6d169f64c0b4b57

Merge "Allow config to disable battery percent setting" into pi-dev

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