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

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

merge cafdea61 w/ one minor conflict in... 

merge cafdea61 w/ one minor conflict in core/java/android/view/MotionEvent.java
parents 3c69d554 cafdea61

core/java/android/view/MotionEvent.java

+75 −66
Original line number Diff line number Diff line
@@ -287,9 +287,10 @@ public final class MotionEvent implements Parcelable { 
                float[] history = mHistory;

                int length = history.length;

                for (int i = 0; i < length; i += 4) {

                    history[i] *= scale;

                    history[i + 2] *= scale;

                    history[i + 3] *= scale;

                    history[i] *= scale;        // X

                                                // history[i + 2] == pressure

                    history[i + 1] *= scale;    // Y

                    history[i + 3] *= scale;    // Size, TODO: square this?

                }

            }

        }
@@ -376,6 +377,7 @@ public final class MotionEvent implements Parcelable { 
    }



    /**

<<<<<<< HEAD:core/java/android/view/MotionEvent.java

     * Returns the time (in ns) when this specific event was generated.

     * The value is in nanosecond precision but it may not have nanosecond accuracy.

     *
@@ -388,6 +390,13 @@ public final class MotionEvent implements Parcelable { 
    /**

     * Returns the X coordinate of this event.  Whole numbers are pixels; the 

     * value may have a fraction for input devices that are sub-pixel precise. 

|||||||

     * Returns the X coordinate of this event.  Whole numbers are pixels; the 

     * value may have a fraction for input devices that are sub-pixel precise. 

=======

     * Returns the X coordinate of this event.  Whole numbers are pixels; the

     * value may have a fraction for input devices that are sub-pixel precise.

>>>>>>> cafdea61a85c8f5d0646cc9413a09346c637f43f:core/java/android/view/MotionEvent.java

     */

    public final float getX() {

        return mX;

core/java/android/view/ViewGroup.java

+2 −1
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        if ((flags & FLAG_CHILDREN_DRAWN_WITH_CACHE) == FLAG_CHILDREN_DRAWN_WITH_CACHE ||

                (flags & FLAG_ALWAYS_DRAWN_WITH_CACHE) == FLAG_ALWAYS_DRAWN_WITH_CACHE) {

            cache = child.getDrawingCache();

            scalingRequired = mAttachInfo.mScalingRequired;

            if (mAttachInfo != null) scalingRequired = mAttachInfo.mScalingRequired;

        }



        final boolean hasNoCache = cache == null;
@@ -1460,6 +1460,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        } else {

            canvas.translate(cl, ct);

            if (scalingRequired) {

                // mAttachInfo cannot be null, otherwise scalingRequired == false

                final float scale = 1.0f / mAttachInfo.mApplicationScale;

                canvas.scale(scale, scale);

            }