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

Commit 920a42ad authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents dace6e60 8b1243e5

api/current.xml

+584 −0
Original line number Diff line number Diff line
@@ -8842,6 +8842,17 @@ 
 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"
@@ -8864,6 +8875,17 @@ 
 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"
@@ -24681,6 +24703,208 @@ 
</parameter>

</method>

</interface>

<class name="WallpaperInfo"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<constructor name="WallpaperInfo"

 type="android.app.WallpaperInfo"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="service" type="android.content.pm.ResolveInfo">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

<exception name="XmlPullParserException" type="org.xmlpull.v1.XmlPullParserException">

</exception>

</constructor>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="dump"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="pw" type="android.util.Printer">

</parameter>

<parameter name="prefix" type="java.lang.String">

</parameter>

</method>

<method name="getComponent"

 return="android.content.ComponentName"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getPackageName"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getServiceInfo"

 return="android.content.pm.ServiceInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getServiceName"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSettingsActivity"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="loadAuthor"

 return="java.lang.CharSequence"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="pm" type="android.content.pm.PackageManager">

</parameter>

<exception name="Resources.NotFoundException" type="android.content.res.Resources.NotFoundException">

</exception>

</method>

<method name="loadDescription"

 return="java.lang.CharSequence"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="pm" type="android.content.pm.PackageManager">

</parameter>

<exception name="Resources.NotFoundException" type="android.content.res.Resources.NotFoundException">

</exception>

</method>

<method name="loadIcon"

 return="android.graphics.drawable.Drawable"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="pm" type="android.content.pm.PackageManager">

</parameter>

</method>

<method name="loadLabel"

 return="java.lang.CharSequence"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="pm" type="android.content.pm.PackageManager">

</parameter>

</method>

<method name="loadThumbnail"

 return="android.graphics.drawable.Drawable"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="pm" type="android.content.pm.PackageManager">

</parameter>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="android.os.Parcel">

</parameter>

<parameter name="flags" type="int">

</parameter>

</method>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="WallpaperManager"

 extends="java.lang.Object"

 abstract="false"
@@ -24772,6 +24996,17 @@ 
<parameter name="context" type="android.content.Context">

</parameter>

</method>

<method name="getWallpaperInfo"

 return="android.app.WallpaperInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="peekDrawable"

 return="android.graphics.drawable.Drawable"

 abstract="false"
@@ -24894,6 +25129,17 @@ 
<parameter name="minimumHeight" type="int">

</parameter>

</method>

<field name="ACTION_LIVE_WALLPAPER_CHOOSER"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

</package>

<package name="android.appwidget"
@@ -79679,6 +79925,17 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<field name="CAMCORDER"

 type="int"

 transient="false"

 volatile="false"

 value="5"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DEFAULT"

 type="int"

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

>

</field>

<field name="VOICE_RECOGNITION"

 type="int"

 transient="false"

 volatile="false"

 value="6"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="VOICE_UPLINK"

 type="int"

 transient="false"
@@ -123184,6 +123452,309 @@ 
</implements>

</interface>

</package>

<package name="android.service.wallpaper"

>

<class name="WallpaperService"

 extends="android.app.Service"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="WallpaperService"

 type="android.service.wallpaper.WallpaperService"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="onBind"

 return="android.os.IBinder"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="intent" type="android.content.Intent">

</parameter>

</method>

<method name="onCreateEngine"

 return="android.service.wallpaper.WallpaperService.Engine"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<field name="SERVICE_INTERFACE"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SERVICE_META_DATA"

 type="java.lang.String"

 transient="false"

 volatile="false"

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

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="WallpaperService.Engine"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="WallpaperService.Engine"

 type="android.service.wallpaper.WallpaperService.Engine"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<method name="getDesiredMinimumHeight"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDesiredMinimumWidth"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSurfaceHolder"

 return="android.view.SurfaceHolder"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isPreview"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isVisible"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onCommand"

 return="android.os.Bundle"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="action" type="java.lang.String">

</parameter>

<parameter name="x" type="int">

</parameter>

<parameter name="y" type="int">

</parameter>

<parameter name="z" type="int">

</parameter>

<parameter name="extras" type="android.os.Bundle">

</parameter>

<parameter name="resultRequested" type="boolean">

</parameter>

</method>

<method name="onCreate"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="surfaceHolder" type="android.view.SurfaceHolder">

</parameter>

</method>

<method name="onDesiredSizeChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="desiredWidth" type="int">

</parameter>

<parameter name="desiredHeight" type="int">

</parameter>

</method>

<method name="onDestroy"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onOffsetsChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="xOffset" type="float">

</parameter>

<parameter name="yOffset" type="float">

</parameter>

<parameter name="xPixelOffset" type="int">

</parameter>

<parameter name="yPixelOffset" type="int">

</parameter>

</method>

<method name="onSurfaceChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="holder" type="android.view.SurfaceHolder">

</parameter>

<parameter name="format" type="int">

</parameter>

<parameter name="width" type="int">

</parameter>

<parameter name="height" type="int">

</parameter>

</method>

<method name="onSurfaceCreated"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="holder" type="android.view.SurfaceHolder">

</parameter>

</method>

<method name="onSurfaceDestroyed"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="holder" type="android.view.SurfaceHolder">

</parameter>

</method>

<method name="onTouchEvent"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="event" type="android.view.MotionEvent">

</parameter>

</method>

<method name="onVisibilityChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="visible" type="boolean">

</parameter>

</method>

<method name="setTouchEventsEnabled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="enabled" type="boolean">

</parameter>

</method>

</class>

</package>

<package name="android.speech"

>

<class name="RecognizerIntent"
@@ -158400,6 +158971,19 @@ 
<parameter name="canvas" type="android.graphics.Canvas">

</parameter>

</method>

<method name="onDrawScrollBars"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="canvas" type="android.graphics.Canvas">

</parameter>

</method>

<method name="onFinishInflate"

 return="void"

 abstract="false"

cmds/stagefright/stagefright.cpp

+3 −3
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ int main(int argc, char **argv) { 


        CHECK(service.get() != NULL);



        sp<IOMX> omx = service->createOMX();

        sp<IOMX> omx = service->getOMX();

        CHECK(omx.get() != NULL);



        const char *kMimeTypes[] = {
@@ -329,11 +329,11 @@ int main(int argc, char **argv) { 


        CHECK(service.get() != NULL);



        sp<IOMX> omx = service->createOMX();

        sp<IOMX> omx = service->getOMX();

        CHECK(omx.get() != NULL);



        List<String8> list;

        omx->list_nodes(&list);

        omx->listNodes(&list);



        for (List<String8>::iterator it = list.begin();

             it != list.end(); ++it) {

core/java/android/app/WallpaperInfo.java

+51 −2
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ import org.xmlpull.v1.XmlPullParserException; 


import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.res.Resources.NotFoundException;

import android.content.res.TypedArray;

import android.content.res.XmlResourceParser;

import android.graphics.drawable.Drawable;
@@ -23,7 +23,6 @@ import java.io.IOException; 


/**

 * This class is used to specify meta information of a wallpaper service.

 * @hide Live Wallpaper

 */

public final class WallpaperInfo implements Parcelable {

    static final String TAG = "WallpaperInfo";
@@ -44,6 +43,16 @@ public final class WallpaperInfo implements Parcelable { 
     */

    final int mThumbnailResource;



    /**

     * Resource identifier for a string indicating the author of the wallpaper.

     */

    final int mAuthorResource;



    /**

     * Resource identifier for a string containing a short description of the wallpaper.

     */

    final int mDescriptionResource;



    /**

     * Constructor.

     *
@@ -59,6 +68,8 @@ public final class WallpaperInfo implements Parcelable { 
        PackageManager pm = context.getPackageManager();

        String settingsActivityComponent = null;

        int thumbnailRes = -1;

        int authorRes = -1;

        int descriptionRes = -1;

        

        XmlResourceParser parser = null;

        try {
@@ -89,6 +100,12 @@ public final class WallpaperInfo implements Parcelable { 
            thumbnailRes = sa.getResourceId(

                    com.android.internal.R.styleable.Wallpaper_thumbnail,

                    -1);

            authorRes = sa.getResourceId(

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

                    -1);

            descriptionRes = sa.getResourceId(

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

                    -1);



            sa.recycle();

        } finally {
@@ -97,11 +114,15 @@ public final class WallpaperInfo implements Parcelable { 
        

        mSettingsActivityName = settingsActivityComponent;

        mThumbnailResource = thumbnailRes;

        mAuthorResource = authorRes;

        mDescriptionResource = descriptionRes;

    }



    WallpaperInfo(Parcel source) {

        mSettingsActivityName = source.readString();

        mThumbnailResource = source.readInt();

        mAuthorResource = source.readInt();

        mDescriptionResource = source.readInt();

        mService = ResolveInfo.CREATOR.createFromParcel(source);

    }
@@ -170,6 +191,32 @@ public final class WallpaperInfo implements Parcelable { 
                              null);

    }



    /**

     * Return a string indicating the author(s) of this wallpaper.

     */

    public CharSequence loadAuthor(PackageManager pm) throws NotFoundException {

        if (mAuthorResource <= 0) throw new NotFoundException();

        return pm.getText(

            (mService.resolvePackageName != null)

                ? mService.resolvePackageName

                : getPackageName(),

            mAuthorResource,

            null);

    }



    /**

     * Return a brief summary of this wallpaper's behavior.

     */

    public CharSequence loadDescription(PackageManager pm) throws NotFoundException {

        if (mDescriptionResource <= 0) throw new NotFoundException();

        return pm.getText(

            (mService.resolvePackageName != null)

                ? mService.resolvePackageName

                : getPackageName(),

            mDescriptionResource,

            null);

    }

    

    /**

     * Return the class name of an activity that provides a settings UI for

     * the wallpaper.  You can launch this activity be starting it with
@@ -206,6 +253,8 @@ public final class WallpaperInfo implements Parcelable { 
    public void writeToParcel(Parcel dest, int flags) {

        dest.writeString(mSettingsActivityName);

        dest.writeInt(mThumbnailResource);

        dest.writeInt(mAuthorResource);

        dest.writeInt(mDescriptionResource);

        mService.writeToParcel(dest, flags);

    }

core/java/android/app/WallpaperManager.java

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ public class WallpaperManager { 
    /**

     * Launch an activity for the user to pick the current global live

     * wallpaper.

     * @hide Live Wallpaper

     */

    public static final String ACTION_LIVE_WALLPAPER_CHOOSER

            = "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER";
@@ -395,7 +394,6 @@ public class WallpaperManager { 
     * If the current wallpaper is a live wallpaper component, return the

     * information about that wallpaper.  Otherwise, if it is a static image,

     * simply return null.

     * @hide Live Wallpaper

     */

    public WallpaperInfo getWallpaperInfo() {

        try {

core/java/android/appwidget/AppWidgetHostView.java

+9 −2
Original line number Diff line number Diff line
@@ -123,8 +123,15 @@ public class AppWidgetHostView extends FrameLayout { 


    @Override

    protected void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {

        ParcelableSparseArray jail = (ParcelableSparseArray) container.get(generateId());

        final Parcelable parcelable = container.get(generateId());



        ParcelableSparseArray jail = null;

        if (parcelable != null && parcelable instanceof ParcelableSparseArray) {

            jail = (ParcelableSparseArray) parcelable;

        }



        if (jail == null) jail = new ParcelableSparseArray();



        super.dispatchRestoreInstanceState(jail);

    }
@@ -140,7 +147,7 @@ public class AppWidgetHostView extends FrameLayout { 


    /**

     * Process a set of {@link RemoteViews} coming in as an update from the

     * AppWidget provider. Will animate into these new views as needed.

     * AppWidget provider. Will animate into these new views as needed

     */

    public void updateAppWidget(RemoteViews remoteViews) {

        if (LOGD) Log.d(TAG, "updateAppWidget called mOld=" + mOld);