diff options
| author | Mitsuru Oshima <oshima@google.com> | 2009-07-20 23:30:04 -0700 |
|---|---|---|
| committer | Mitsuru Oshima <oshima@google.com> | 2009-07-20 23:30:04 -0700 |
| commit | 7f44ca3170abb5b02933d1900b2fccff794bc77c (patch) | |
| tree | 6375d217d165d8d20e8306109fb029751f6b186d /res/xml | |
| parent | 3a76bcaa83c15f96832f934e67e6f0190e72a3dc (diff) | |
| parent | 5c20034b7fc9d333c5c2e111a88696606fe0797f (diff) | |
| download | packages_apps_settings-7f44ca3170abb5b02933d1900b2fccff794bc77c.zip packages_apps_settings-7f44ca3170abb5b02933d1900b2fccff794bc77c.tar.gz packages_apps_settings-7f44ca3170abb5b02933d1900b2fccff794bc77c.tar.bz2 | |
Merge commit '5c20034b' into fix
Conflicts:
res/values/strings.xml
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/sound_and_display_settings.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml index 223e52a..639204a 100644 --- a/res/xml/sound_and_display_settings.xml +++ b/res/xml/sound_and_display_settings.xml @@ -130,12 +130,6 @@ android:persistent="false" android:entries="@array/screen_timeout_entries" android:entryValues="@array/screen_timeout_values" /> - - <CheckBoxPreference - android:key="compatibility_mode" - android:title="@string/compatibility_mode_title" - android:summaryOn="@string/compatibility_mode_summary_on" - android:summaryOff="@string/compatibility_mode_summary_off" /> </PreferenceCategory> </PreferenceScreen> |