diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-09-20 16:58:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-20 16:58:52 -0700 |
| commit | 7e9111695d42b6d794a5a9beb422b6727c6f6559 (patch) | |
| tree | aa16f100245ada1b1ab5ce148e99241b31f517fe /res/xml | |
| parent | 7d858a45444a4c3b6b3a91d63d9db12da99eaccf (diff) | |
| parent | bce7b69a27731ae9a58dbfa8f446c3b93d1f1cc6 (diff) | |
| download | packages_apps_Settings-7e9111695d42b6d794a5a9beb422b6727c6f6559.zip packages_apps_Settings-7e9111695d42b6d794a5a9beb422b6727c6f6559.tar.gz packages_apps_Settings-7e9111695d42b6d794a5a9beb422b6727c6f6559.tar.bz2 | |
am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom
* commit 'bce7b69a27731ae9a58dbfa8f446c3b93d1f1cc6':
Move "Pulse notification light" to Display settings.
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/display_settings.xml | 5 | ||||
| -rw-r--r-- | res/xml/sound_settings.xml | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index a399828..2ff56d8 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -55,4 +55,9 @@ android:entryValues="@array/entryvalues_font_size" android:dialogTitle="@string/dialog_title_font_size" /> + <CheckBoxPreference + android:key="notification_pulse" + android:title="@string/notification_pulse_title" + android:persistent="false" /> + </PreferenceScreen> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index da33d6a..fc6fdf5 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -89,11 +89,6 @@ android:title="@string/haptic_feedback_enable_title" android:defaultValue="true" /> - <CheckBoxPreference - android:key="notification_pulse" - android:title="@string/notification_pulse_title" - android:persistent="false" /> - <ListPreference android:key="emergency_tone" android:title="@string/emergency_tone_title" |