summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2016-05-04 17:43:43 +0200
committerSteve Kondik <shade@chemlab.org>2016-05-09 13:59:20 -0700
commit1dc89a668dcd325613304ee42b504d52605b8b2d (patch)
tree9ff89df51d08fee0fcc212b5474881850120682e
parent215d44020f4a6449260ebbab55feb3462f2416a6 (diff)
downloadpackages_apps_Settings-1dc89a668dcd325613304ee42b504d52605b8b2d.zip
packages_apps_Settings-1dc89a668dcd325613304ee42b504d52605b8b2d.tar.gz
packages_apps_Settings-1dc89a668dcd325613304ee42b504d52605b8b2d.tar.bz2
Disable battery pulsing if segmented battery LED is enabled
Change-Id: Ic5b4e7ce7830c43e84f9a14919ea85bbe993ac99
-rw-r--r--src/com/android/settings/notificationlight/BatteryLightSettings.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/notificationlight/BatteryLightSettings.java b/src/com/android/settings/notificationlight/BatteryLightSettings.java
index 80d7fa2..2ee884e 100644
--- a/src/com/android/settings/notificationlight/BatteryLightSettings.java
+++ b/src/com/android/settings/notificationlight/BatteryLightSettings.java
@@ -71,7 +71,8 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements
mLightEnabledPref = (CMSystemSettingSwitchPreference) prefSet.findPreference(LIGHT_ENABLED_PREF);
mPulseEnabledPref = (CMSystemSettingSwitchPreference) prefSet.findPreference(PULSE_ENABLED_PREF);
- if (!getResources().getBoolean(com.android.internal.R.bool.config_ledCanPulse)) {
+ if (!getResources().getBoolean(com.android.internal.R.bool.config_ledCanPulse) ||
+ getResources().getBoolean(org.cyanogenmod.platform.internal.R.bool.config_useSegmentedBatteryLed)) {
mGeneralPrefs.removePreference(mPulseEnabledPref);
}