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

Commit bcbcaa7e authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Wallpapers, animations, pending intent. 

Some more tweaks and fixes to wallpapers.  Make sure wallpapers are
told they are not visible when the screen is off.  Add some new animations
for transitions across tasks, and fiddle with many of the existing
animations.  Clean up the relationship between translucent activities
and animations.  Add new API to start a PendingIntent from an
activity.

Change-Id: Ie0bf45fe44081bb6982c75361257a55d9cd9d863
parent e1fd0240

api/current.xml

+69 −0
Original line number Diff line number Diff line
@@ -17060,6 +17060,27 @@ 
<parameter name="id" type="int">

</parameter>

</method>

<method name="startActivity"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="intent" type="android.app.PendingIntent">

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

<exception name="PendingIntent.CanceledException" type="android.app.PendingIntent.CanceledException">

</exception>

</method>

<method name="startActivityForResult"

 return="void"

 abstract="false"
@@ -17075,6 +17096,29 @@ 
<parameter name="requestCode" type="int">

</parameter>

</method>

<method name="startActivityForResult"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="intent" type="android.app.PendingIntent">

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

<exception name="PendingIntent.CanceledException" type="android.app.PendingIntent.CanceledException">

</exception>

</method>

<method name="startActivityFromChild"

 return="void"

 abstract="false"
@@ -17092,6 +17136,31 @@ 
<parameter name="requestCode" type="int">

</parameter>

</method>

<method name="startActivityFromChild"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="child" type="android.app.Activity">

</parameter>

<parameter name="intent" type="android.app.PendingIntent">

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

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

</parameter>

<exception name="PendingIntent.CanceledException" type="android.app.PendingIntent.CanceledException">

</exception>

</method>

<method name="startActivityIfNeeded"

 return="boolean"

 abstract="false"

core/java/android/app/Activity.java

+96 −4
Original line number Diff line number Diff line
@@ -2649,10 +2649,8 @@ public class Activity extends ContextThemeWrapper 
    }



    @Override

    protected void onApplyThemeResource(Resources.Theme theme,

                                      int resid,

                                      boolean first)

    {

    protected void onApplyThemeResource(Resources.Theme theme, int resid,

            boolean first) {

        if (mParent == null) {

            super.onApplyThemeResource(theme, resid, first);

        } else {
@@ -2722,6 +2720,66 @@ public class Activity extends ContextThemeWrapper 
        }

    }



    /**

     * Like {@link #startActivityForResult(Intent, int)}, but allowing you

     * to use a PendingIntent to describe the activity to be started.  Note

     * that the given PendingIntent <em>must</em> have been created with

     * {@link PendingIntent#getActivity PendingIntent.getActivity}; all other

     * types will result in an IllegalArgumentException being thrown.

     * 

     * @param intent The PendingIntent to launch.

     * @param requestCode If >= 0, this code will be returned in

     *                    onActivityResult() when the activity exits.

     * @param fillInIntent If non-null, this will be provided as the

     * intent parameter to {@link PendingIntent#send(Context, int, Intent)

     * PendingIntent.send(Context, int, Intent)}.

     * @param flagsMask Intent flags in the original PendingIntent that you

     * would like to change.

     * @param flagsValues Desired values for any bits set in

     * <var>flagsMask</var>

     */

    public void startActivityForResult(PendingIntent intent, int requestCode,

            Intent fillInIntent, int flagsMask, int flagsValues)

            throws PendingIntent.CanceledException {

        if (mParent == null) {

            startActivityForResultInner(intent, requestCode, fillInIntent,

                    flagsMask, flagsValues, this);

        } else {

            mParent.startActivityFromChild(this, intent, requestCode,

                    fillInIntent, flagsMask, flagsValues);

        }

    }



    private void startActivityForResultInner(PendingIntent intent, int requestCode,

            Intent fillInIntent, int flagsMask, int flagsValues, Activity activity)

            throws PendingIntent.CanceledException {

        try {

            String resolvedType = null;

            if (fillInIntent != null) {

                resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver());

            }

            int result = ActivityManagerNative.getDefault()

                .startActivityPendingIntent(mMainThread.getApplicationThread(), intent,

                        fillInIntent, resolvedType, mToken, activity.mEmbeddedID,

                        requestCode, flagsMask, flagsValues);

            if (result == IActivityManager.START_CANCELED) {

                throw new PendingIntent.CanceledException();

            }

            Instrumentation.checkStartActivityResult(result, null);

        } catch (RemoteException e) {

        }

        if (requestCode >= 0) {

            // If this start is requesting a result, we can avoid making

            // the activity visible until the result is received.  Setting

            // this code during onCreate(Bundle savedInstanceState) or onResume() will keep the

            // activity hidden during this time, to avoid flickering.

            // This can only be done when a result is requested because

            // that guarantees we will get information back when the

            // activity is finished, no matter what happens to it.

            mStartedActivity = true;

        }

    }



    /**

     * Launch a new activity.  You will not receive any information about when

     * the activity exits.  This implementation overrides the base version,
@@ -2745,6 +2803,27 @@ public class Activity extends ContextThemeWrapper 
        startActivityForResult(intent, -1);

    }



    /**

     * Like {@link #startActivity(Intent)}, but taking a PendingIntent

     * to start; see

     * {@link #startActivityForResult(PendingIntent, int, Intent, int, int)}

     * for more information.

     * 

     * @param intent The PendingIntent to launch.

     * @param fillInIntent If non-null, this will be provided as the

     * intent parameter to {@link PendingIntent#send(Context, int, Intent)

     * PendingIntent.send(Context, int, Intent)}.

     * @param flagsMask Intent flags in the original PendingIntent that you

     * would like to change.

     * @param flagsValues Desired values for any bits set in

     * <var>flagsMask</var>

     */

    public void startActivity(PendingIntent intent,

            Intent fillInIntent, int flagsMask, int flagsValues)

            throws PendingIntent.CanceledException {

        startActivityForResult(intent, -1, fillInIntent, flagsMask, flagsValues);

    }



    /**

     * A special variation to launch an activity only if a new activity

     * instance is needed to handle the given Intent.  In other words, this is
@@ -2865,6 +2944,19 @@ public class Activity extends ContextThemeWrapper 
        }

    }



    /**

     * Like {@link #startActivityFromChild(Activity, Intent, int)}, but

     * taking a PendingIntent; see

     * {@link #startActivityForResult(PendingIntent, int, Intent, int, int)}

     * for more information.

     */

    public void startActivityFromChild(Activity child, PendingIntent intent,

            int requestCode, Intent fillInIntent, int flagsMask, int flagsValues)

            throws PendingIntent.CanceledException {

        startActivityForResultInner(intent, requestCode, fillInIntent,

                flagsMask, flagsValues, child);

    }



    /**

     * Call this to set the result that your activity will return to its

     * caller.

core/java/android/app/ActivityManagerNative.java

+52 −0
Original line number Diff line number Diff line
@@ -145,6 +145,30 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case START_ACTIVITY_PENDING_INTENT_TRANSACTION:

        {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder b = data.readStrongBinder();

            IApplicationThread app = ApplicationThreadNative.asInterface(b);

            PendingIntent intent = PendingIntent.CREATOR.createFromParcel(data);

            Intent fillInIntent = null;

            if (data.readInt() != 0) {

                fillInIntent = Intent.CREATOR.createFromParcel(data);

            }

            String resolvedType = data.readString();

            IBinder resultTo = data.readStrongBinder();

            String resultWho = data.readString();    

            int requestCode = data.readInt();

            int flagsMask = data.readInt();

            int flagsValues = data.readInt();

            int result = startActivityPendingIntent(app, intent,

                    fillInIntent, resolvedType, resultTo, resultWho,

                    requestCode, flagsMask, flagsValues);

            reply.writeNoException();

            reply.writeInt(result);

            return true;

        }

        

        case START_NEXT_MATCHING_ACTIVITY_TRANSACTION:

        {

            data.enforceInterface(IActivityManager.descriptor);
@@ -1179,6 +1203,34 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

        return result;

    }

    public int startActivityPendingIntent(IApplicationThread caller,

            PendingIntent intent, Intent fillInIntent, String resolvedType,

            IBinder resultTo, String resultWho, int requestCode,

            int flagsMask, int flagsValues) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller != null ? caller.asBinder() : null);

        intent.writeToParcel(data, 0);

        if (fillInIntent != null) {

            data.writeInt(1);

            fillInIntent.writeToParcel(data, 0);

        } else {

            data.writeInt(0);

        }

        data.writeString(resolvedType);

        data.writeStrongBinder(resultTo);

        data.writeString(resultWho);

        data.writeInt(requestCode);

        data.writeInt(flagsMask);

        data.writeInt(flagsValues);

        mRemote.transact(START_ACTIVITY_PENDING_INTENT_TRANSACTION, data, reply, 0);

        reply.readException();

        int result = reply.readInt();

        reply.recycle();

        data.recycle();

        return result;

    }

    public boolean startNextMatchingActivity(IBinder callingActivity,

            Intent intent) throws RemoteException {

        Parcel data = Parcel.obtain();

core/java/android/app/IActivityManager.java

+7 −0
Original line number Diff line number Diff line
@@ -77,10 +77,16 @@ public interface IActivityManager extends IInterface { 
    public static final int START_CLASS_NOT_FOUND = -2;

    public static final int START_FORWARD_AND_REQUEST_CONFLICT = -3;

    public static final int START_PERMISSION_DENIED = -4;

    public static final int START_NOT_ACTIVITY = -5;

    public static final int START_CANCELED = -6;

    public int startActivity(IApplicationThread caller,

            Intent intent, String resolvedType, Uri[] grantedUriPermissions,

            int grantedMode, IBinder resultTo, String resultWho, int requestCode,

            boolean onlyIfNeeded, boolean debug) throws RemoteException;

    public int startActivityPendingIntent(IApplicationThread caller,

            PendingIntent intent, Intent fillInIntent, String resolvedType,

            IBinder resultTo, String resultWho, int requestCode,

            int flagsMask, int flagsValues) throws RemoteException;

    public boolean startNextMatchingActivity(IBinder callingActivity,

            Intent intent) throws RemoteException;

    public boolean finishActivity(IBinder token, int code, Intent data)
@@ -436,4 +442,5 @@ public interface IActivityManager extends IInterface { 
    int CLOSE_SYSTEM_DIALOGS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+96;

    int GET_PROCESS_MEMORY_INFO_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+97;

    int KILL_APPLICATION_PROCESS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+98;

    int START_ACTIVITY_PENDING_INTENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+99;

}

core/java/android/app/Instrumentation.java

+6 −3
Original line number Diff line number Diff line
@@ -1468,7 +1468,7 @@ public class Instrumentation { 
        mWatcher = watcher;

    }



    /*package*/ static void checkStartActivityResult(int res, Intent intent) {

    /*package*/ static void checkStartActivityResult(int res, Object intent) {

        if (res >= IActivityManager.START_SUCCESS) {

            return;

        }
@@ -1476,10 +1476,10 @@ public class Instrumentation { 
        switch (res) {

            case IActivityManager.START_INTENT_NOT_RESOLVED:

            case IActivityManager.START_CLASS_NOT_FOUND:

                if (intent.getComponent() != null)

                if (intent instanceof Intent && ((Intent)intent).getComponent() != null)

                    throw new ActivityNotFoundException(

                            "Unable to find explicit activity class "

                            + intent.getComponent().toShortString()

                            + ((Intent)intent).getComponent().toShortString()

                            + "; have you declared this activity in your AndroidManifest.xml?");

                throw new ActivityNotFoundException(

                        "No Activity found to handle " + intent);
@@ -1489,6 +1489,9 @@ public class Instrumentation { 
            case IActivityManager.START_FORWARD_AND_REQUEST_CONFLICT:

                throw new AndroidRuntimeException(

                        "FORWARD_RESULT_FLAG used while also requesting a result");

            case IActivityManager.START_NOT_ACTIVITY:

                throw new IllegalArgumentException(

                        "PendingIntent is not an activity");

            default:

                throw new AndroidRuntimeException("Unknown error code "

                        + res + " when starting " + intent);