commit f098231eb0b5a59d5504832db8c5910e2713f850
author Gilles Debunne <debunne@google.com> Fri Jul 29 15:47:15 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 29 15:47:15 2011 -0700
tree 6013f82a5e1d6b4ee253c35558fa20c251b0dfa3
parent d48d794f4594b386655ce93785c2658107e19663
parent d1d9fc3ac9f2b6f2f2b8d042ed4e6180d0ac904f

Merge "Bug 5003361: No Android Dreams in Settings / Display"

res/xml/display_settings.xml

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index c13a107..a399828 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -40,10 +40,12 @@
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
 
+        <!-- 
         <PreferenceScreen 
                 android:title="@string/dream_settings_title" 
                 android:summary="@string/dream_settings_summary"
                 android:fragment="com.android.settings.DreamSettings" />
+        -->
 
         <ListPreference
                 android:key="font_size"