diff options
| author | John Spurlock <jspurlock@google.com> | 2012-09-26 12:17:42 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2012-09-26 12:44:39 -0400 |
| commit | f41f505fac0ba31159d3cdba3ca9e0c00bc3fe9b (patch) | |
| tree | 62104918ab4503e0227b82ff9691c138d07a05f4 /core/java/android/service | |
| parent | 72a374705d32cf715443aa203f75c159e1bc9bd5 (diff) | |
| download | frameworks_base-f41f505fac0ba31159d3cdba3ca9e0c00bc3fe9b.zip frameworks_base-f41f505fac0ba31159d3cdba3ca9e0c00bc3fe9b.tar.gz frameworks_base-f41f505fac0ba31159d3cdba3ca9e0c00bc3fe9b.tar.bz2 | |
Dream metadata now specified using an xml-resource.
Removed old metadata key for dream settings activity, now defined in attrs.xml.
Also took this opportunity to remove Dream#lightsOut.
Bug:7172816
Bug:7211867
Change-Id: Ied18a527d2dc2aacc19d7a9543f090653232f0ed
Diffstat (limited to 'core/java/android/service')
| -rw-r--r-- | core/java/android/service/dreams/Dream.java | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/core/java/android/service/dreams/Dream.java b/core/java/android/service/dreams/Dream.java index dedfb0c..473414c 100644 --- a/core/java/android/service/dreams/Dream.java +++ b/core/java/android/service/dreams/Dream.java @@ -59,10 +59,10 @@ import com.android.internal.policy.PolicyManager; * <category android:name="android.intent.category.DREAM" /> * </intent-filter> * - * <!-- Point to configuration activity for this dream (optional) --> + * <!-- Point to additional information for this dream (optional) --> * <meta-data - * android:name="android.service.dreams.config_activity" - * android:value="com.example.mypackage/com.example.mypackage.MyDreamSettingsActivity" /> + * android:name="android.service.dream" + * android:resource="@xml/my_dream" /> * </service> * } * </pre> @@ -81,12 +81,12 @@ public class Dream extends Service implements Window.Callback { "android.intent.category.DREAM"; /** - * Service meta-data key for declaring an optional configuration activity. - * - * @see Dream - * */ - public static final String METADATA_NAME_CONFIG_ACTIVITY = - "android.service.dreams.config_activity"; + * Name under which a Dream publishes information about itself. + * This meta-data must reference an XML resource containing + * a <code><{@link android.R.styleable#Dream dream}></code> + * tag. + */ + public static final String DREAM_META_DATA = "android.service.dream"; /** * Broadcast Action: Sent after the system starts dreaming. @@ -361,13 +361,6 @@ public class Dream extends Service implements Window.Callback { return getWindow().findViewById(id); } - /** FIXME remove once platform dreams are updated */ - @Deprecated - protected void lightsOut() { - setLowProfile(true); - setFullscreen(true); - } - /** * Marks this dream as interactive to receive input events. * |