Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84215565 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev

parents c5211780 be87e2f5

api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -5777,6 +5777,8 @@ package android.content { 
    field public static final java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";

    field public static final java.lang.String ACTION_DIAL = "android.intent.action.DIAL";

    field public static final java.lang.String ACTION_DOCK_EVENT = "android.intent.action.DOCK_EVENT";

    field public static final java.lang.String ACTION_DREAMING_STARTED = "android.intent.action.DREAMING_STARTED";

    field public static final java.lang.String ACTION_DREAMING_STOPPED = "android.intent.action.DREAMING_STOPPED";

    field public static final java.lang.String ACTION_EDIT = "android.intent.action.EDIT";

    field public static final java.lang.String ACTION_EXTERNAL_APPLICATIONS_AVAILABLE = "android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE";

    field public static final java.lang.String ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE = "android.intent.action.EXTERNAL_APPLICATIONS_UNAVAILABLE";
@@ -20317,8 +20319,8 @@ package android.security { 














package android.service.dreams {



























  public class Dream extends android.app.Service implements android.view.Window.Callback {













    ctor public Dream();













  public class DreamService extends android.app.Service implements android.view.Window.Callback {













    ctor public DreamService();















    method public void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);















    method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);















    method public boolean dispatchKeyEvent(android.view.KeyEvent);










@@ -20358,10 +20360,8 @@ package android.service.dreams {













    method public void setInteractive(boolean);















    method public void setLowProfile(boolean);















    method public void setScreenBright(boolean);













    field public static final java.lang.String ACTION_DREAMING_STARTED = "android.intent.action.DREAMING_STARTED";













    field public static final java.lang.String ACTION_DREAMING_STOPPED = "android.intent.action.DREAMING_STOPPED";













    field public static final java.lang.String CATEGORY_DREAM = "android.intent.category.DREAM";















    field public static final java.lang.String DREAM_META_DATA = "android.service.dream";













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.dreams.DreamService";















  }





























}

























core/java/android/content/Intent.java



+18
−0




























Original line number
Diff line number
Diff line








@@ -1389,6 +1389,24 @@ public class Intent implements Parcelable, Cloneable {













    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)















    public static final String ACTION_SCREEN_ON = "android.intent.action.SCREEN_ON";





























    /**













     * Broadcast Action: Sent after the system stops dreaming.













     *













     * <p class="note">This is a protected intent that can only be sent by the system.













     * It is only sent to registered receivers.</p>













     */













    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)













    public static final String ACTION_DREAMING_STOPPED = "android.intent.action.DREAMING_STOPPED";



























    /**













     * Broadcast Action: Sent after the system starts dreaming.













     *













     * <p class="note">This is a protected intent that can only be sent by the system.













     * It is only sent to registered receivers.</p>













     */













    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)













    public static final String ACTION_DREAMING_STARTED = "android.intent.action.DREAMING_STARTED";





























    /**















     * Broadcast Action: Sent when the user is present after device wakes up (e.g when the















     * keyguard is gone).

































core/java/android/service/dreams/Dream.java



+3
−619


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/service/dreams/DreamService.java
0 → 100644



+619
−0


























File added.
Preview size limit exceeded, changes collapsed.
























core/res/res/values/attrs.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -5307,9 +5307,9 @@





























    <!-- Use <code>dream</code> as the root tag of the XML resource that















         describes an













         {@link android.service.dreams.Dream}, which is













         {@link android.service.dreams.DreamService}, which is















         referenced from its













         {@link android.service.dreams.Dream#DREAM_META_DATA}













         {@link android.service.dreams.DreamService#DREAM_META_DATA}















         meta-data entry.  Described here are the attributes that can be















         included in that tag. -->















    <declare-styleable name="Dream">