diff options
| author | Gilles Debunne <debunne@google.com> | 2011-07-08 09:40:00 -0700 |
|---|---|---|
| committer | Gilles Debunne <debunne@google.com> | 2011-07-08 11:56:48 -0700 |
| commit | 737c81c775b24ca36c5325e45678f6df80bbaa43 (patch) | |
| tree | b67a2f3e0268341326b4c9c31d8383783d28b4cc /res/xml/display_settings.xml | |
| parent | 6dc0f9639e5c566818930fa183e67927a1b761f8 (diff) | |
| download | packages_apps_Settings-737c81c775b24ca36c5325e45678f6df80bbaa43.zip packages_apps_Settings-737c81c775b24ca36c5325e45678f6df80bbaa43.tar.gz packages_apps_Settings-737c81c775b24ca36c5325e45678f6df80bbaa43.tar.bz2 | |
Bug 5003461 - Removed animation option
Associated change in DatabaseHelper to reset this value in the database.
Change-Id: I530da617c44773fad31e62f595d0c335daf64148
Diffstat (limited to 'res/xml/display_settings.xml')
| -rw-r--r-- | res/xml/display_settings.xml | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index b0abd9a..c13a107 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -23,18 +23,16 @@ android:title="@string/brightness" android:dialogTitle="@string/brightness" /> + <PreferenceScreen + android:key="wallpaper" + android:title="@string/wallpaper_settings_title" + android:fragment="com.android.settings.WallpaperTypeSettings" /> + <CheckBoxPreference android:key="accelerometer" android:title="@string/accelerometer_title"/> <ListPreference - android:key="animations" - android:title="@string/animations_title" - android:persistent="false" - android:entries="@array/animations_entries" - android:entryValues="@array/animations_values" /> - - <ListPreference android:key="screen_timeout" android:title="@string/screen_timeout" android:summary="@string/screen_timeout_summary" @@ -42,18 +40,10 @@ android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> - <PreferenceScreen - android:key="wallpaper" - android:title="@string/wallpaper_settings_title" - android:fragment="com.android.settings.WallpaperTypeSettings" - /> - <PreferenceScreen android:title="@string/dream_settings_title" android:summary="@string/dream_settings_summary" - android:fragment="com.android.settings.DreamSettings" - > - </PreferenceScreen> + android:fragment="com.android.settings.DreamSettings" /> <ListPreference android:key="font_size" |