diff options
author | Amith Yamasani <yamasani@google.com> | 2009-12-02 08:40:50 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 08:40:50 -0800 |
commit | 1443eb9f35ee419807da96e26315df2798988f33 (patch) | |
tree | 8ddfd60fe123b216f0069959b3a5c0cf9494fe0b /res/values | |
parent | 546d78f4278d6090ed4c0b116970c363a13aae4a (diff) | |
parent | 8f2fb65b360ebc7ed71ddbc884451536e5e99c03 (diff) | |
download | packages_apps_Settings-1443eb9f35ee419807da96e26315df2798988f33.zip packages_apps_Settings-1443eb9f35ee419807da96e26315df2798988f33.tar.gz packages_apps_Settings-1443eb9f35ee419807da96e26315df2798988f33.tar.bz2 |
am 8f2fb65b: Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-plus-aosp
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/bools.xml | 21 | ||||
-rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 25 insertions, 0 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 59a7520..fc7a07e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -877,6 +877,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 --> |