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

Commit 293a00c9 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Allow specifying rotation animation in manifest."

parents 1a845e36 0f5d7539

api/current.txt

+10 −9
Original line number Diff line number Diff line
@@ -1041,6 +1041,7 @@ package android { 
    field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093

    field public static final int ringtoneType = 16843257; // 0x10101f9

    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationAnimation = 16843688; // 0x10103a8

    field public static final int rotationX = 16843559; // 0x1010327

    field public static final int rotationY = 16843560; // 0x1010328

    field public static final int roundIcon = 16844076; // 0x101052c
@@ -11796,14 +11797,14 @@ package android.graphics { 
    method public deprecated boolean clipRegion(android.graphics.Region);

    method public void concat(android.graphics.Matrix);

    method public void drawARGB(int, int, int, int);

    method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);

    method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);

    method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);

    method public deprecated void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);

    method public deprecated void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);

    method public void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint);

    method public void drawCircle(float, float, float, android.graphics.Paint);

    method public void drawColor(int);
@@ -11811,28 +11812,28 @@ package android.graphics { 
    method public void drawLine(float, float, float, float, android.graphics.Paint);

    method public void drawLines(float[], int, int, android.graphics.Paint);

    method public void drawLines(float[], android.graphics.Paint);

    method public void drawOval(android.graphics.RectF, android.graphics.Paint);

    method public void drawOval(float, float, float, float, android.graphics.Paint);

    method public void drawOval(android.graphics.RectF, android.graphics.Paint);

    method public void drawPaint(android.graphics.Paint);

    method public void drawPath(android.graphics.Path, android.graphics.Paint);

    method public void drawPicture(android.graphics.Picture);

    method public void drawPicture(android.graphics.Picture, android.graphics.RectF);

    method public void drawPicture(android.graphics.Picture, android.graphics.Rect);

    method public void drawPicture(android.graphics.Picture, android.graphics.RectF);

    method public void drawPoint(float, float, android.graphics.Paint);

    method public void drawPoints(float[], int, int, android.graphics.Paint);

    method public void drawPoints(float[], android.graphics.Paint);

    method public deprecated void drawPosText(char[], int, int, float[], android.graphics.Paint);

    method public deprecated void drawPosText(java.lang.String, float[], android.graphics.Paint);

    method public void drawRGB(int, int, int);

    method public void drawRect(android.graphics.RectF, android.graphics.Paint);

    method public void drawRect(android.graphics.Rect, android.graphics.Paint);

    method public void drawRect(float, float, float, float, android.graphics.Paint);

    method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);

    method public void drawRect(android.graphics.Rect, android.graphics.Paint);

    method public void drawRect(android.graphics.RectF, android.graphics.Paint);

    method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);

    method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);

    method public void drawText(char[], int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.String, float, float, android.graphics.Paint);

    method public void drawText(java.lang.String, int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);

    method public void drawTextOnPath(char[], int, int, android.graphics.Path, float, float, android.graphics.Paint);

    method public void drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint);

    method public void drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint);

api/system-current.txt

+10 −9
Original line number Diff line number Diff line
@@ -1147,6 +1147,7 @@ package android { 
    field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093

    field public static final int ringtoneType = 16843257; // 0x10101f9

    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationAnimation = 16843688; // 0x10103a8

    field public static final int rotationX = 16843559; // 0x1010327

    field public static final int rotationY = 16843560; // 0x1010328

    field public static final int roundIcon = 16844076; // 0x101052c
@@ -12243,14 +12244,14 @@ package android.graphics { 
    method public deprecated boolean clipRegion(android.graphics.Region);

    method public void concat(android.graphics.Matrix);

    method public void drawARGB(int, int, int, int);

    method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);

    method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);

    method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);

    method public deprecated void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);

    method public deprecated void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);

    method public void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint);

    method public void drawCircle(float, float, float, android.graphics.Paint);

    method public void drawColor(int);
@@ -12258,28 +12259,28 @@ package android.graphics { 
    method public void drawLine(float, float, float, float, android.graphics.Paint);

    method public void drawLines(float[], int, int, android.graphics.Paint);

    method public void drawLines(float[], android.graphics.Paint);

    method public void drawOval(android.graphics.RectF, android.graphics.Paint);

    method public void drawOval(float, float, float, float, android.graphics.Paint);

    method public void drawOval(android.graphics.RectF, android.graphics.Paint);

    method public void drawPaint(android.graphics.Paint);

    method public void drawPath(android.graphics.Path, android.graphics.Paint);

    method public void drawPicture(android.graphics.Picture);

    method public void drawPicture(android.graphics.Picture, android.graphics.RectF);

    method public void drawPicture(android.graphics.Picture, android.graphics.Rect);

    method public void drawPicture(android.graphics.Picture, android.graphics.RectF);

    method public void drawPoint(float, float, android.graphics.Paint);

    method public void drawPoints(float[], int, int, android.graphics.Paint);

    method public void drawPoints(float[], android.graphics.Paint);

    method public deprecated void drawPosText(char[], int, int, float[], android.graphics.Paint);

    method public deprecated void drawPosText(java.lang.String, float[], android.graphics.Paint);

    method public void drawRGB(int, int, int);

    method public void drawRect(android.graphics.RectF, android.graphics.Paint);

    method public void drawRect(android.graphics.Rect, android.graphics.Paint);

    method public void drawRect(float, float, float, float, android.graphics.Paint);

    method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);

    method public void drawRect(android.graphics.Rect, android.graphics.Paint);

    method public void drawRect(android.graphics.RectF, android.graphics.Paint);

    method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);

    method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);

    method public void drawText(char[], int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.String, float, float, android.graphics.Paint);

    method public void drawText(java.lang.String, int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);

    method public void drawTextOnPath(char[], int, int, android.graphics.Path, float, float, android.graphics.Paint);

    method public void drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint);

    method public void drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint);

api/test-current.txt

+10 −9
Original line number Diff line number Diff line
@@ -1041,6 +1041,7 @@ package android { 
    field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093

    field public static final int ringtoneType = 16843257; // 0x10101f9

    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationAnimation = 16843688; // 0x10103a8

    field public static final int rotationX = 16843559; // 0x1010327

    field public static final int rotationY = 16843560; // 0x1010328

    field public static final int roundIcon = 16844076; // 0x101052c
@@ -11813,14 +11814,14 @@ package android.graphics { 
    method public deprecated boolean clipRegion(android.graphics.Region);

    method public void concat(android.graphics.Matrix);

    method public void drawARGB(int, int, int, int);

    method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);

    method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);

    method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);

    method public deprecated void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);

    method public deprecated void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);

    method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);

    method public void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint);

    method public void drawCircle(float, float, float, android.graphics.Paint);

    method public void drawColor(int);
@@ -11828,28 +11829,28 @@ package android.graphics { 
    method public void drawLine(float, float, float, float, android.graphics.Paint);

    method public void drawLines(float[], int, int, android.graphics.Paint);

    method public void drawLines(float[], android.graphics.Paint);

    method public void drawOval(android.graphics.RectF, android.graphics.Paint);

    method public void drawOval(float, float, float, float, android.graphics.Paint);

    method public void drawOval(android.graphics.RectF, android.graphics.Paint);

    method public void drawPaint(android.graphics.Paint);

    method public void drawPath(android.graphics.Path, android.graphics.Paint);

    method public void drawPicture(android.graphics.Picture);

    method public void drawPicture(android.graphics.Picture, android.graphics.RectF);

    method public void drawPicture(android.graphics.Picture, android.graphics.Rect);

    method public void drawPicture(android.graphics.Picture, android.graphics.RectF);

    method public void drawPoint(float, float, android.graphics.Paint);

    method public void drawPoints(float[], int, int, android.graphics.Paint);

    method public void drawPoints(float[], android.graphics.Paint);

    method public deprecated void drawPosText(char[], int, int, float[], android.graphics.Paint);

    method public deprecated void drawPosText(java.lang.String, float[], android.graphics.Paint);

    method public void drawRGB(int, int, int);

    method public void drawRect(android.graphics.RectF, android.graphics.Paint);

    method public void drawRect(android.graphics.Rect, android.graphics.Paint);

    method public void drawRect(float, float, float, float, android.graphics.Paint);

    method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);

    method public void drawRect(android.graphics.Rect, android.graphics.Paint);

    method public void drawRect(android.graphics.RectF, android.graphics.Paint);

    method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);

    method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);

    method public void drawText(char[], int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.String, float, float, android.graphics.Paint);

    method public void drawText(java.lang.String, int, int, float, float, android.graphics.Paint);

    method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);

    method public void drawTextOnPath(char[], int, int, android.graphics.Path, float, float, android.graphics.Paint);

    method public void drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint);

    method public void drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint);

core/java/android/content/pm/ActivityInfo.java

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.util.Printer; 
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;



import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_ROTATE;



/**

 * Information you can retrieve about a particular application

 * activity or receiver. This corresponds to information collected
@@ -763,6 +765,13 @@ public class ActivityInfo extends ComponentInfo 
     */

    public String parentActivityName;



    /**

     * Screen rotation animation desired by the activity, with values as defined

     * for {@link android.view.WindowManager.LayoutParams#rotationAnimation}.

     * @hide

     */

    public int rotationAnimation = ROTATION_ANIMATION_ROTATE;



    /** @hide */

    public static final int LOCK_TASK_LAUNCH_MODE_DEFAULT = 0;

    /** @hide */
@@ -822,6 +831,7 @@ public class ActivityInfo extends ComponentInfo 
        windowLayout = orig.windowLayout;

        resizeMode = orig.resizeMode;

        requestedVrComponent = orig.requestedVrComponent;

        rotationAnimation = orig.rotationAnimation;

    }



    /**
@@ -972,6 +982,7 @@ public class ActivityInfo extends ComponentInfo 
        }

        dest.writeInt(resizeMode);

        dest.writeString(requestedVrComponent);

        dest.writeInt(rotationAnimation);

    }



    public static final Parcelable.Creator<ActivityInfo> CREATOR
@@ -1006,6 +1017,7 @@ public class ActivityInfo extends ComponentInfo 
        }

        resizeMode = source.readInt();

        requestedVrComponent = source.readString();

        rotationAnimation = source.readInt();

    }



    /**

core/java/android/content/pm/PackageParser.java

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NOT_APK; 
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES;

import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;

import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER;

import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_ROTATE;



/**

 * Parser for package files (APKs) on disk. This supports apps packaged either
@@ -3572,6 +3573,9 @@ public class PackageParser { 


            a.info.requestedVrComponent =

                sa.getString(R.styleable.AndroidManifestActivity_enableVrMode);



            a.info.rotationAnimation =

                sa.getInt(R.styleable.AndroidManifestActivity_rotationAnimation, ROTATION_ANIMATION_ROTATE);

        } else {

            a.info.launchMode = ActivityInfo.LAUNCH_MULTIPLE;

            a.info.configChanges = 0;