Merge "Use a new config flag to decide if notification led pulsing can be turned on/off."

res/values/bools.xml

@@ -15,9 +15,6 @@
 -->
 
 <resources>
-    <!-- Whether or not there is a notification led that is too intrusive to be pulsing
-         constantly -->
-    <bool name="has_intrusive_led">false</bool>
     <!-- Whether or not the dock settings are to be displayed for this device when docked -->
     <bool name="has_dock_settings">false</bool>
     <!-- Whether there is a silent mode checkbox  -->

src/com/android/settings/SoundSettings.java

@@ -191,7 +191,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements
         mNotificationPulse = (CheckBoxPreference)
                 mSoundSettings.findPreference(KEY_NOTIFICATION_PULSE);
         if (mNotificationPulse != null
-                && getResources().getBoolean(R.bool.has_intrusive_led) == false) {
+                && getResources().getBoolean(
+                        com.android.internal.R.bool.config_intrusiveNotificationLed) == false) {
             mSoundSettings.removePreference(mNotificationPulse);
         } else {
             try {