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

Commit 84e20013 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Fix mPositionInWindow to not use global coords" into sc-dev am: 184c6139 

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

Change-Id: I234f8d466d5c128fdc467ff8dff8176857c6c2ad
parents fb7a52b9 184c6139

core/java/android/view/ScrollCaptureTarget.java

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

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.UiThread;

import android.annotation.UiThread;

import android.graphics.Matrix;

import android.graphics.Point;

import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.Rect;

import android.os.CancellationSignal;

import android.os.CancellationSignal;





import com.android.internal.util.FastMath;



import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.function.Consumer;

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

    private final int mHint;

    private Rect mScrollBounds;

    private Rect mScrollBounds;





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

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

    private final Matrix mMatrixViewLocalToWindow = new Matrix();





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

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

            @NonNull Point positionInWindow, @NonNull ScrollCaptureCallback callback) {

            @NonNull Point positionInWindow, @NonNull ScrollCaptureCallback callback) {
@@ -117,28 +113,15 @@ 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 it's offset within the window, based on the current

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

     * state of the {@code containing view}.

     * state of the {@code containing view}.

     */

     */

    @UiThread

    @UiThread

    public void updatePositionInWindow() {

    public void updatePositionInWindow() {

        mMatrixViewLocalToWindow.reset();

        mContainingView.getLocationInWindow(mTmpIntArr);

        mContainingView.transformMatrixToGlobal(mMatrixViewLocalToWindow);

        mPositionInWindow.x = mTmpIntArr[0];



        mPositionInWindow.y = mTmpIntArr[1];

        zero(mTmpFloatArr);

        mMatrixViewLocalToWindow.mapPoints(mTmpFloatArr);

        roundIntoPoint(mPositionInWindow, mTmpFloatArr);

    }

    }





    public String toString() {

    public String toString() {