Mathew Inwood 08e080c314 resolve merge conflicts of 1ddeb9e01f to stage-dr1-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.

Change-Id: Id12be0fe86a73fcf39cc2c82a1f681df910fc03f
Merged-In: I7fc1162d2c63df8751a4660607e8ce72070efed8

2018-08-02 17:31:50 +01:00

..

shapes

…

AdaptiveIconDrawable.java

Setting the alpha on the full bitmap for AdaptiveIcon instead of individual layers

2018-03-07 10:11:56 -08:00

Animatable2.java

…

Animatable.java

…

AnimatedImageDrawable.java

AnimatedImageDrawable: Eliminate unnecessary calls to redraw

2018-05-16 18:51:07 -04:00

AnimatedRotateDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

AnimatedStateListDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

AnimatedVectorDrawable.java

resolve merge conflicts of 1ddeb9e01f to stage-dr1-aosp-master

2018-08-02 17:31:50 +01:00

AnimationDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

BitmapDrawable.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00

ClipDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

ColorDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

Drawable.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00

DrawableContainer.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

DrawableInflater.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00

DrawableWrapper.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00

GradientDrawable.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00

Icon.aidl

…

Icon.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00

InsetDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

LayerDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

LevelListDrawable.java

…

NinePatchDrawable.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00

package.html

…

PaintDrawable.java

…

PictureDrawable.java

…

RippleBackground.java

Yet more alpha tweaks for Ripples

2018-02-16 13:18:30 -08:00

RippleComponent.java

Tweak ripples

2017-12-12 11:29:02 -08:00

RippleDrawable.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00

RippleForeground.java

Clamp ripple starting x/y further

2018-02-07 14:36:02 -08:00

RotateDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

ScaleDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

ShapeDrawable.java

…

StateListDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

TransitionDrawable.java

Add @UnsupportedAppUsage annotations

2018-07-31 14:36:52 +01:00

VectorDrawable.java

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

2018-08-02 14:24:12 +00:00