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

Commit c533e107 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Fix typos"

parents d2101ad4 599f535b

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

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public class Transformation { 
    }



    /**

     * @return The 3x3 Matrix representing the trnasformation to apply to the

     * @return The 3x3 Matrix representing the transformation to apply to the

     * coordinates of the object being animated

     */

    public Matrix getMatrix() {
@@ -167,7 +167,7 @@ public class Transformation { 


    /**

     * Sets the degree of transparency

     * @param alpha 1.0 means fully opaqe and 0.0 means fully transparent

     * @param alpha 1.0 means fully opaque and 0.0 means fully transparent

     */

    public void setAlpha(@FloatRange(from=0.0, to=1.0) float alpha) {

        mAlpha = alpha;

core/java/android/window/TransitionInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ public final class TransitionInfo implements Parcelable { 
            return options;

        }



        public static AnimationOptions makeThumnbnailAnimOptions(HardwareBuffer srcThumb,

        public static AnimationOptions makeThumbnailAnimOptions(HardwareBuffer srcThumb,

                int startX, int startY, boolean scaleUp) {

            AnimationOptions options = new AnimationOptions(

                    scaleUp ? ANIM_THUMBNAIL_SCALE_UP : ANIM_THUMBNAIL_SCALE_DOWN);

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -4536,7 +4536,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                        pendingOptions.getStartX(), pendingOptions.getStartY(),

                        pendingOptions.getAnimationStartedListener(),

                        scaleUp);

                options = AnimationOptions.makeThumnbnailAnimOptions(buffer,

                options = AnimationOptions.makeThumbnailAnimOptions(buffer,

                        pendingOptions.getStartX(), pendingOptions.getStartY(), scaleUp);

                startCallback = pendingOptions.getAnimationStartedListener();

                if (intent.getSourceBounds() == null && buffer != null) {