summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2011-11-02 23:30:27 -0400
committerDaniel Sandler <dsandler@android.com>2011-11-02 23:30:27 -0400
commitf53c3602f92d623f03e941c1d590a4720578cf5e (patch)
treeb4cbb3fec68965b5f86b87f704b9bb33185e8e51
parent00f68e0d749649f28607623aa163e9d1cd6fd96e (diff)
downloadpackages_apps_settings-f53c3602f92d623f03e941c1d590a4720578cf5e.zip
packages_apps_settings-f53c3602f92d623f03e941c1d590a4720578cf5e.tar.gz
packages_apps_settings-f53c3602f92d623f03e941c1d590a4720578cf5e.tar.bz2
Bring back Android Dreams.
Bug: 5121105 Change-Id: I29ddee7e4a83a01844cdb735de14c02dcbf3086c
-rw-r--r--res/xml/display_settings.xml2
-rw-r--r--src/com/android/settings/DreamTesterPreference.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 2ff56d8..6cd2e56 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -40,12 +40,10 @@
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"
diff --git a/src/com/android/settings/DreamTesterPreference.java b/src/com/android/settings/DreamTesterPreference.java
index 7ff5667..78858b1 100644
--- a/src/com/android/settings/DreamTesterPreference.java
+++ b/src/com/android/settings/DreamTesterPreference.java
@@ -67,7 +67,7 @@ public class DreamTesterPreference extends Preference {
.setComponent(cn)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
- | Intent.FLAG_ACTIVITY_SINGLE_TOP)
+ )
.putExtra("android.dreams.TEST", true);
getContext().startActivity(intent);
}