diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-12-02 09:55:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 09:55:29 -0800 |
| commit | 1b305084946df160b801596615b6e5090d70fa2e (patch) | |
| tree | 056fb69f0f45d65276296527a453bc8b4a00d254 /res/values | |
| parent | 1451d22954b90987d4fc732e4fade5a2d0285568 (diff) | |
| parent | 379953def17d6aec7a07a01a7d337403c63bdf44 (diff) | |
| download | packages_apps_settings-1b305084946df160b801596615b6e5090d70fa2e.zip packages_apps_settings-1b305084946df160b801596615b6e5090d70fa2e.tar.gz packages_apps_settings-1b305084946df160b801596615b6e5090d70fa2e.tar.bz2 | |
am 379953de: am 8f2fb65b: Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '379953def17d6aec7a07a01a7d337403c63bdf44' into eclair-mr2-plus-aosp
* commit '379953def17d6aec7a07a01a7d337403c63bdf44':
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 5bbe03d..45277c1 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 --> |