am 8f2fb65b: Setting in Sound & Display for trackball pulsing on notification. Bug #2238250

Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-mr2

* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
  Setting in Sound & Display for trackball pulsing on notification. Bug #2238250

3 files changed, 33 insertions, 2 deletions

diff --git a/res/values/bools.xml b/res/values/bools.xml
new file mode 100644
index 0000000..cc816c0
--- /dev/null
+++ b/res/values/bools.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Whether or not there is a notification led that is too intrusive to be pulsing
+         constantly -->
+    <bool name="has_intrusive_led">false</bool>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7b0a21a..28cf1a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -865,6 +865,10 @@
     <string name="notification_sound_title">Notification ringtone</string>
     <!-- Sound settings screen, setting option summary text -->
     <string name="notification_sound_summary">Set your default notification ringtone</string>
+    <!-- Sound settings screen, notification light repeat pulsing title -->
+    <string name="notification_pulse_title">Pulse notification light</string>
+    <!-- Sound settings screen, notification light repeat pulsing summary -->
+    <string name="notification_pulse_summary">Pulse trackball light repeatedly for new notifications</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
     <string name="incoming_call_volume_title">Incoming call volume</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 8544fee..c597a0a 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
         
-    <PreferenceCategory
+    <PreferenceCategory android:key="sound_settings"
             android:title="@string/sound_settings">
             
         <CheckBoxPreference
@@ -67,7 +67,13 @@
                 android:dependency="silent"
                 android:persistent="false"
                 android:ringtoneType="notification" />
-                
+
+        <CheckBoxPreference
+                android:key="notification_pulse"
+                android:title="@string/notification_pulse_title"
+                android:summary="@string/notification_pulse_summary"
+                android:persistent="false" />
+
         <CheckBoxPreference
                 android:key="dtmf_tone"
                 android:title="@string/dtmf_tone_enable_title"