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

Commit ad9bcb22 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master

parents 0af04493 7d039fbe

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

+1 −1
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ public abstract class Animation implements Cloneable { 
        region.inset(-1.0f, -1.0f);

        if (mFillBefore) {

            final Transformation previousTransformation = mPreviousTransformation;

            applyTransformation(0.0f, previousTransformation);

            applyTransformation(mInterpolator.getInterpolation(0.0f), previousTransformation);

        }

    }

core/java/android/view/animation/AnimationSet.java

+3 −1
Original line number Diff line number Diff line
@@ -282,7 +282,9 @@ public class AnimationSet extends Animation { 
                final Animation a = animations.get(i);



                temp.clear();

                a.applyTransformation(0.0f, temp);

                final Interpolator interpolator = a.mInterpolator;

                a.applyTransformation(interpolator != null ? interpolator.getInterpolation(0.0f)

                        : 0.0f, temp);

                previousTransformation.compose(temp);

            }

        }

location/java/com/android/internal/location/GpsLocationProvider.java

+2 −0
Original line number Diff line number Diff line
@@ -890,6 +890,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { 
            switch (status) {

                case GPS_STATUS_SESSION_BEGIN:

                    mNavigating = true;

                    mEngineOn = true;

                    break;

                case GPS_STATUS_SESSION_END:

                    mNavigating = false;
@@ -899,6 +900,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub { 
                    break;

                case GPS_STATUS_ENGINE_OFF:

                    mEngineOn = false;

                    mNavigating = false;

                    break;

            }

test-runner/android/test/TouchUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ public class TouchUtils { 
        float xStep = (toX - fromX) / stepCount;



        MotionEvent event = MotionEvent.obtain(downTime, eventTime,

                MotionEvent.ACTION_DOWN, fromX, y, 0);

                MotionEvent.ACTION_DOWN, x, y, 0);

        inst.sendPointerSync(event);

        inst.waitForIdleSync();
@@ -787,7 +787,7 @@ public class TouchUtils { 
        }



        eventTime = SystemClock.uptimeMillis();

        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, fromX, y, 0);

        event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);

        inst.sendPointerSync(event);

        inst.waitForIdleSync();

    }