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

Commit 53469616 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

resolve merge conflicts of 6987a91e to stage-aosp-master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I773bda19dc7b32c01bf064bf78b517896e8df991
Change-Id: I2c9bd92522932175856fb72ca5cce2c1999f4a1e
parents db7fd6ee 6987a91e

config/hiddenapi-light-greylist.txt

+0 −15
Original line number Diff line number Diff line
@@ -5615,21 +5615,6 @@ Landroid/view/AccessibilityIterators$AbstractTextSegmentIterator;-><init>()V 
Landroid/view/AccessibilityIterators$AbstractTextSegmentIterator;->mText:Ljava/lang/String;

Landroid/view/ActionProvider;->reset()V

Landroid/view/ActionProvider;->setSubUiVisibilityListener(Landroid/view/ActionProvider$SubUiVisibilityListener;)V

Landroid/view/animation/Animation;->detach()V

Landroid/view/animation/Animation;->getInvalidateRegion(IIIILandroid/graphics/RectF;Landroid/view/animation/Transformation;)V

Landroid/view/animation/Animation;->initializeInvalidateRegion(IIII)V

Landroid/view/animation/Animation;->mListener:Landroid/view/animation/Animation$AnimationListener;

Landroid/view/animation/Animation;->mPreviousRegion:Landroid/graphics/RectF;

Landroid/view/animation/Animation;->mPreviousTransformation:Landroid/view/animation/Transformation;

Landroid/view/animation/Animation;->mRegion:Landroid/graphics/RectF;

Landroid/view/animation/Animation;->mTransformation:Landroid/view/animation/Transformation;

Landroid/view/animation/AnimationUtils;->createAnimationFromXml(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;Landroid/view/animation/AnimationSet;Landroid/util/AttributeSet;)Landroid/view/animation/Animation;

Landroid/view/animation/Transformation;->printShortString(Ljava/io/PrintWriter;)V

Landroid/view/animation/TranslateAnimation;->mFromXValue:F

Landroid/view/animation/TranslateAnimation;->mFromYValue:F

Landroid/view/animation/TranslateAnimation;->mToXValue:F

Landroid/view/animation/TranslateAnimation;->mToYValue:F

Landroid/view/animation/TranslateYAnimation;-><init>(IFIF)V

Landroid/view/autofill/IAutoFillManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/view/autofill/IAutoFillManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/autofill/IAutoFillManager;

Landroid/view/Choreographer$CallbackQueue;->addCallbackLocked(JLjava/lang/Object;Ljava/lang/Object;)V

core/java/android/view/animation/Animation.java

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view.animation; 
import android.annotation.AnimRes;

import android.annotation.ColorInt;

import android.annotation.InterpolatorRes;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.RectF;
@@ -183,6 +184,7 @@ public abstract class Animation implements Cloneable { 
    /**

     * The animation listener to be notified when the animation starts, ends or repeats.

     */

    @UnsupportedAppUsage

    AnimationListener mListener;



    /**
@@ -211,9 +213,13 @@ public abstract class Animation implements Cloneable { 
    private boolean mMore = true;

    private boolean mOneMoreTime = true;



    @UnsupportedAppUsage

    RectF mPreviousRegion = new RectF();

    @UnsupportedAppUsage

    RectF mRegion = new RectF();

    @UnsupportedAppUsage

    Transformation mTransformation = new Transformation();

    @UnsupportedAppUsage

    Transformation mPreviousTransformation = new Transformation();



    private final CloseGuard guard = CloseGuard.get();
@@ -322,6 +328,7 @@ public abstract class Animation implements Cloneable { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public void detach() {

        if (mStarted && !mEnded) {

            mEnded = true;
@@ -1046,6 +1053,7 @@ public abstract class Animation implements Cloneable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    public void getInvalidateRegion(int left, int top, int right, int bottom,

            RectF invalidate, Transformation transformation) {
@@ -1077,6 +1085,7 @@ public abstract class Animation implements Cloneable { 
     *

     * @hide

     */

    @UnsupportedAppUsage

    public void initializeInvalidateRegion(int left, int top, int right, int bottom) {

        final RectF region = mPreviousRegion;

        region.set(left, top, right, bottom);

core/java/android/view/animation/AnimationUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.view.animation; 
import android.annotation.AnimRes;

import android.annotation.InterpolatorRes;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources.NotFoundException;
@@ -157,6 +158,7 @@ public class AnimationUtils { 
        return createAnimationFromXml(c, parser, null, Xml.asAttributeSet(parser));

    }



    @UnsupportedAppUsage

    private static Animation createAnimationFromXml(Context c, XmlPullParser parser,

            AnimationSet parent, AttributeSet attrs) throws XmlPullParserException, IOException {

core/java/android/view/animation/Transformation.java

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.view.animation;



import android.annotation.FloatRange;

import android.annotation.UnsupportedAppUsage;

import android.graphics.Matrix;

import android.graphics.Rect;
@@ -238,6 +239,7 @@ public class Transformation { 
     * Print short string, to optimize dumping.

     * @hide

     */

    @UnsupportedAppUsage

    public void printShortString(PrintWriter pw) {

        pw.print("{alpha="); pw.print(mAlpha);

        pw.print(" matrix=");

core/java/android/view/animation/TranslateAnimation.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.view.animation;



import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.TypedArray;

import android.util.AttributeSet;
@@ -34,13 +35,17 @@ public class TranslateAnimation extends Animation { 
    private int mToYType = ABSOLUTE;



    /** @hide */

    @UnsupportedAppUsage

    protected float mFromXValue = 0.0f;

    /** @hide */

    @UnsupportedAppUsage

    protected float mToXValue = 0.0f;



    /** @hide */

    @UnsupportedAppUsage

    protected float mFromYValue = 0.0f;

    /** @hide */

    @UnsupportedAppUsage

    protected float mToYValue = 0.0f;



    /** @hide */