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

am: 1f6c7910fb

Change-Id: Ief7df5312104e44bda140f68dd5e6821c2736bbf
This commit is contained in:
Evan Laird
2018-06-21 14:58:14 -07:00
committed by android-build-merger

View File

@@ -20,6 +20,7 @@ import android.provider.Settings;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v14.preference.SwitchPreference; import android.support.v14.preference.SwitchPreference;
import com.android.internal.R;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
@@ -40,7 +41,8 @@ public class BatteryPercentagePreferenceController extends AbstractPreferenceCon
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return true; return mContext.getResources()
.getBoolean(R.bool.config_battery_percentage_setting_available);
} }
@Override @Override