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

Commit 3cc49505 authored by Paul Hobbs's avatar Paul Hobbs Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix mPositionInWindow to not use global coords"" into sc-dev... 

Merge "Revert "Fix mPositionInWindow to not use global coords"" into sc-dev am: 0a0f6b35 am: 9137c0d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15131785

Change-Id: Ida0140bd0b20eb378a72764a10b05636b3b2b376
parents 5ab8f74a 9137c0d6

core/java/android/view/ScrollCaptureTarget.java

+22 −5
Original line number Diff line number Diff line
@@ -21,10 +21,13 @@ import static java.util.Objects.requireNonNull; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UiThread;

import android.graphics.Matrix;

import android.graphics.Point;

import android.graphics.Rect;

import android.os.CancellationSignal;



import com.android.internal.util.FastMath;



import java.io.PrintWriter;

import java.util.function.Consumer;
@@ -40,7 +43,8 @@ public final class ScrollCaptureTarget { 
    private final int mHint;

    private Rect mScrollBounds;



    private final int[] mTmpIntArr = new int[2];

    private final float[] mTmpFloatArr = new float[2];

    private final Matrix mMatrixViewLocalToWindow = new Matrix();



    public ScrollCaptureTarget(@NonNull View scrollTarget, @NonNull Rect localVisibleRect,

            @NonNull Point positionInWindow, @NonNull ScrollCaptureCallback callback) {
@@ -113,15 +117,28 @@ public final class ScrollCaptureTarget { 
        }

    }



    private static void zero(float[] pointArray) {

        pointArray[0] = 0;

        pointArray[1] = 0;

    }



    private static void roundIntoPoint(Point pointObj, float[] pointArray) {

        pointObj.x = FastMath.round(pointArray[0]);

        pointObj.y = FastMath.round(pointArray[1]);

    }



    /**

     * Refresh the local visible bounds and its offset within the window, based on the current

     * Refresh the local visible bounds and it's offset within the window, based on the current

     * state of the {@code containing view}.

     */

    @UiThread

    public void updatePositionInWindow() {

        mContainingView.getLocationInWindow(mTmpIntArr);

        mPositionInWindow.x = mTmpIntArr[0];

        mPositionInWindow.y = mTmpIntArr[1];

        mMatrixViewLocalToWindow.reset();

        mContainingView.transformMatrixToGlobal(mMatrixViewLocalToWindow);



        zero(mTmpFloatArr);

        mMatrixViewLocalToWindow.mapPoints(mTmpFloatArr);

        roundIntoPoint(mPositionInWindow, mTmpFloatArr);

    }



    public String toString() {