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

Commit 23ef7b48 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix most of issue #2271640: Fix wallpaper etc docs 

Only thing remaining is the live wallpaper feature.

Change-Id: I8854c7978999d759bf618307f4f984c9c89d3fc8
parent d2a9f54f

api/current.xml

+45 −51
Original line number Diff line number Diff line
@@ -1934,6 +1934,17 @@ 
 visibility="public"

>

</field>

<field name="author"

 type="int"

 transient="false"

 volatile="false"

 value="16843444"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="authorities"

 type="int"

 transient="false"
@@ -1971,7 +1982,7 @@ 
 type="int"

 transient="false"

 volatile="false"

 value="16843446"

 value="16843445"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -8853,17 +8864,6 @@ 
 visibility="public"

>

</field>

<field name="wallpaperAuthor"

 type="int"

 transient="false"

 volatile="false"

 value="16843444"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperCloseEnterAnimation"

 type="int"

 transient="false"
@@ -8886,17 +8886,6 @@ 
 visibility="public"

>

</field>

<field name="wallpaperDescription"

 type="int"

 transient="false"

 volatile="false"

 value="16843445"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="wallpaperIntraCloseEnterAnimation"

 type="int"

 transient="false"
@@ -25166,6 +25155,28 @@ 
 visibility="public"

>

</field>

<field name="COMMAND_DROP"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.home.drop&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="COMMAND_TAP"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.wallpaper.tap&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.appwidget"
@@ -99872,6 +99883,17 @@ 
 visibility="public"

>

</field>

<field name="ECLAIR_MR1"

 type="int"

 transient="false"

 volatile="false"

 value="7"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Bundle"

 extends="java.lang.Object"
@@ -123817,34 +123839,6 @@ 
</parameter>

</method>

</class>

<class name="WallpaperSettingsActivity"

 extends="android.preference.PreferenceActivity"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="WallpaperSettingsActivity"

 type="android.service.wallpaper.WallpaperSettingsActivity"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<field name="EXTRA_PREVIEW_MODE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.service.wallpaper.PREVIEW_MODE&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.speech"

>

core/java/android/app/WallpaperInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -101,10 +101,10 @@ public final class WallpaperInfo implements Parcelable { 
                    com.android.internal.R.styleable.Wallpaper_thumbnail,

                    -1);

            authorRes = sa.getResourceId(

                    com.android.internal.R.styleable.Wallpaper_wallpaperAuthor,

                    com.android.internal.R.styleable.Wallpaper_author,

                    -1);

            descriptionRes = sa.getResourceId(

                    com.android.internal.R.styleable.Wallpaper_wallpaperDescription,

                    com.android.internal.R.styleable.Wallpaper_description,

                    -1);



            sa.recycle();

core/java/android/app/WallpaperManager.java

+16 −1
Original line number Diff line number Diff line
@@ -63,6 +63,21 @@ public class WallpaperManager { 
    public static final String ACTION_LIVE_WALLPAPER_CHOOSER

            = "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER";

    

    /**

     * Command for {@link #sendWallpaperCommand}: reported by the wallpaper

     * host when the user taps on an empty area (not performing an action

     * in the host).  The x and y arguments are the location of the tap in

     * screen coordinates.

     */

    public static final String COMMAND_TAP = "android.wallpaper.tap";

    

    /**

     * Command for {@link #sendWallpaperCommand}: reported by the wallpaper

     * host when the user drops an object into an area of the host.  The x

     * and y arguments are the location of the drop.

     */

    public static final String COMMAND_DROP = "android.home.drop";

    

    private final Context mContext;

    

    /**
@@ -604,7 +619,7 @@ public class WallpaperManager { 
    /**

     * For applications that use multiple virtual screens showing a wallpaper,

     * specify the step size between virtual screens. For example, if the

     * launcher has 5 virtual screens, it would specify an xStep of 0.5,

     * launcher has 3 virtual screens, it would specify an xStep of 0.5,

     * since the X offset for those screens are 0.0, 0.5 and 1.0

     * @param xStep The X offset delta from one screen to the next one 

     * @param yStep The Y offset delta from one screen to the next one

core/java/android/os/Build.java

+5 −0
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ public class Build { 
         * December 2009: Android 2.0.1

         */

        public static final int ECLAIR_0_1 = 6;

        

        /**

         * January 2010: Android 2.1

         */

        public static final int ECLAIR_MR1 = 7;

    }

    

    /** The type of build, like "user" or "eng". */

core/java/android/service/wallpaper/WallpaperService.java

+12 −1
Original line number Diff line number Diff line
@@ -46,7 +46,12 @@ import android.view.WindowManagerImpl; 


/**

 * A wallpaper service is responsible for showing a live wallpaper behind

 * applications that would like to sit on top of it.

 * applications that would like to sit on top of it.  This service object

 * itself does very little -- its only purpose is to generate instances of

 * {@link WallpaperSerice.Engine} as needed.  Implementing a wallpaper thus

 * involves subclassing from this, subclassing an Engine implementation,

 * and implementing {@link #onCreateEngine()} to return a new instance of

 * your engine.

 */

public abstract class WallpaperService extends Service {

    /**
@@ -861,5 +866,11 @@ public abstract class WallpaperService extends Service { 
        mCallbackLooper = looper;

    }

    

    /**

     * Must be implemented to return a new instance of the wallpaper's engine.

     * Note that multiple instances may be active at the same time, such as

     * when the wallpaper is currently set as the active wallpaper and the user

     * is in the wallpaper picker viewing a preview of it as well.

     */

    public abstract Engine onCreateEngine();

}