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

Commit 3b2cd1d5 authored by Craig Mautner's avatar Craig Mautner
Browse files

Update API per council requests 

launchTaskBehindBackgroundAnimation => launchTaskBehindTargetAnimation
visibilityMode => transitionVisiblityMode
makeLaunchTaskBehindAnimation => makeTaskLaunchBehind
launch_task_behind_background = launch_task_behind_target

Fixes bug 16958544.

Change-Id: I3b7c791fc0671b8071a5377cf6fa878bd5861f70
parent 0e47941d

api/current.txt

+4 −3
Original line number Diff line number Diff line
@@ -785,8 +785,8 @@ package android { 
    field public static final int largeScreens = 16843398; // 0x1010286

    field public static final int largestWidthLimitDp = 16843622; // 0x1010366

    field public static final int launchMode = 16842781; // 0x101001d

    field public static final int launchTaskBehindBackgroundAnimation = 16843921; // 0x1010491

    field public static final int launchTaskBehindSourceAnimation = 16843922; // 0x1010492

    field public static final int launchTaskBehindTargetAnimation = 16843921; // 0x1010491

    field public static final int layerType = 16843604; // 0x1010354

    field public static final int layout = 16842994; // 0x10100f2

    field public static final int layoutAnimation = 16842988; // 0x10100ec
@@ -1349,6 +1349,7 @@ package android { 
    field public static final int transitionGroup = 16843803; // 0x101041b

    field public static final int transitionName = 16843802; // 0x101041a

    field public static final int transitionOrdering = 16843744; // 0x10103e0

    field public static final int transitionVisibilityMode = 16843900; // 0x101047c

    field public static final int translateX = 16843866; // 0x101045a

    field public static final int translateY = 16843867; // 0x101045b

    field public static final int translationX = 16843554; // 0x1010322
@@ -1385,7 +1386,6 @@ package android { 
    field public static final int viewportHeight = 16843805; // 0x101041d

    field public static final int viewportWidth = 16843804; // 0x101041c

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visibilityMode = 16843900; // 0x101047c

    field public static final int visible = 16843156; // 0x1010194

    field public static final int vmSafeMode = 16843448; // 0x10102b8

    field public static final int voiceIcon = 16843908; // 0x1010484
@@ -3773,10 +3773,11 @@ package android.app { 














  public class ActivityOptions {















    method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);













    method public static android.app.ActivityOptions makeLaunchTaskBehindAnimation();













    method public static deprecated android.app.ActivityOptions makeLaunchTaskBehindAnimation();















    method public static android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int);















    method public static android.app.ActivityOptions makeSceneTransitionAnimation(android.app.Activity, android.view.View, java.lang.String);















    method public static android.app.ActivityOptions makeSceneTransitionAnimation(android.app.Activity, android.util.Pair<android.view.View, java.lang.String>...);













    method public static android.app.ActivityOptions makeTaskLaunchBehind();















    method public static android.app.ActivityOptions makeThumbnailScaleUpAnimation(android.view.View, android.graphics.Bitmap, int, int);















    method public android.os.Bundle toBundle();















    method public void update(android.app.ActivityOptions);

























core/java/android/app/ActivityOptions.java



+6
−1




























Original line number
Diff line number
Diff line








@@ -444,12 +444,17 @@ public class ActivityOptions {













     * android.R.styleable#AndroidManifestActivity_launchMode launchMode} values of















     * <code>singleInstance</code> or <code>singleTask</code>.















     */













    public static ActivityOptions makeLaunchTaskBehindAnimation() {













    public static ActivityOptions makeTaskLaunchBehind() {















        final ActivityOptions opts = new ActivityOptions();















        opts.mAnimationType = ANIM_LAUNCH_TASK_BEHIND;















        return opts;















    }





























    @Deprecated













    public static ActivityOptions makeLaunchTaskBehindAnimation() {













        return makeTaskLaunchBehind();













    }





























    /** @hide */















    public boolean getLaunchTaskBehind() {















        return mAnimationType == ANIM_LAUNCH_TASK_BEHIND;

































core/java/android/transition/Visibility.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -84,7 +84,7 @@ public abstract class Visibility extends Transition {













    public Visibility(Context context, AttributeSet attrs) {















        super(context, attrs);















        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.VisibilityTransition);













        int mode = a.getInt(R.styleable.VisibilityTransition_visibilityMode, 0);













        int mode = a.getInt(R.styleable.VisibilityTransition_transitionVisibilityMode, 0);















        a.recycle();















        if (mode != 0) {















            setMode(mode);









@@ -97,7 +97,7 @@ public abstract class Visibility extends Transition {













     *















     * @param mode The behavior supported by this transition, a combination of















     *             {@link #MODE_IN} and {@link #MODE_OUT}.













     * @attr ref android.R.styleable#VisibilityTransition_visibilityMode













     * @attr ref android.R.styleable#VisibilityTransition_transitionVisibilityMode















     */















    public void setMode(int mode) {















        if ((mode & ~(MODE_IN | MODE_OUT)) != 0) {









@@ -111,7 +111,7 @@ public abstract class Visibility extends Transition {













     *















     * Returns whether appearing and/or disappearing Views are supported. A combination of















     *         {@link #MODE_IN} and {@link #MODE_OUT}.













     * @attr ref android.R.styleable#VisibilityTransition_visibilityMode













     * @attr ref android.R.styleable#VisibilityTransition_transitionVisibilityMode















     */















    public int getMode() {















        return mMode;





































core/res/res/values/attrs.xml



+3
−3




























Original line number
Diff line number
Diff line








@@ -1952,7 +1952,7 @@













        <!--  When opening an activity in a new task using Intent/FLAG_ACTIVITY_LAUNCH_BEHIND,















              this is the animation that is run on the activity of the new task (which is















              entering the screen and then leaving). -->













        <attr name="launchTaskBehindBackgroundAnimation" format="reference" />













        <attr name="launchTaskBehindTargetAnimation" format="reference" />















        <!--  When opening an activity in a new task using Intent.FLAG_ACTIVITY_LAUNCH_BEHIND,















              this is the animation that is run on the activity of the old task (which is















              already on the screen and then stays on). -->










@@ -5531,7 +5531,7 @@













         resource are available in addition to the specific attributes of Fade















         described here. -->















    <declare-styleable name="Fade">













        <!-- Equivalent to <code>visibilityMode</code>, fadingMode works only













        <!-- Equivalent to <code>transitionVisibilityMode</code>, fadingMode works only















             with the Fade transition. -->















        <attr name="fadingMode">















            <!-- Fade will only fade appearing items in. -->










@@ -5567,7 +5567,7 @@













    <declare-styleable name="VisibilityTransition">















        <!-- Changes whether the transition supports appearing and/or disappearing Views.















             Corresponds to {@link android.transition.Visibility#setMode(int)}. -->













        <attr name="visibilityMode">













        <attr name="transitionVisibilityMode">















            <!-- Only appearing Views will be supported. -->















            <flag name="mode_in" value="1" />















            <!-- Only disappearing Views will be supported. -->