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

Commit b6914ab6 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Vishnu Nair
Browse files

Added contentSize to WindowInfo 

In order to compute TPL using WindowInfoListener, it needs contentSize
to know the original bounds vs the displayed bounds. This is to ensure
the crop is factored in when computing percentage visible.

Test: WindowInfo
Bug: 290795410
Change-Id: Ife3d277de8359b40a5dd645a858e6d12312cf748
parent 028e9b35

core/java/android/view/InputWindowHandle.java

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.Region; 
import android.gui.TouchOcclusionMode;

import android.os.IBinder;

import android.os.InputConfig;

import android.util.Size;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -106,6 +107,9 @@ public final class InputWindowHandle { 
    // Window frame.

    public final Rect frame = new Rect();



    // The real size of the content, excluding any crop. If no buffer is rendered, this is 0,0

    public Size contentSize = new Size(0, 0);



    public int surfaceInset;



    // Global scaling factor applied to touch events when they are dispatched
@@ -199,6 +203,7 @@ public final class InputWindowHandle { 
            transform.set(other.transform);

        }

        focusTransferTarget = other.focusTransferTarget;

        contentSize = new Size(other.contentSize.getWidth(), other.contentSize.getHeight());

    }



    @Override
@@ -211,6 +216,7 @@ public final class InputWindowHandle { 
                .append(", windowToken=").append(windowToken)

                .append(", displayId=").append(displayId)

                .append(", isClone=").append((inputConfig & InputConfig.CLONE) != 0)

                .append(", contentSize=").append(contentSize)

                .toString();



    }

core/jni/android_hardware_input_InputWindowHandle.cpp

+7 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static struct { 
    jfieldID layoutParamsType;

    jfieldID dispatchingTimeoutMillis;

    jfieldID frame;

    jfieldID contentSize;

    jfieldID surfaceInset;

    jfieldID scaleFactor;

    jfieldID touchableRegion;
@@ -281,6 +282,9 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn 
    ScopedLocalRef<jobject> rectObj(env, JNICommon::objFromRect(env, windowInfo.frame));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.frame, rectObj.get());



    ScopedLocalRef<jobject> sizeObj(env, JNICommon::objFromSize(env, windowInfo.contentSize));

    env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.contentSize, sizeObj.get());



    env->SetIntField(inputWindowHandle, gInputWindowHandleClassInfo.surfaceInset,

                     windowInfo.surfaceInset);

    env->SetFloatField(inputWindowHandle, gInputWindowHandleClassInfo.scaleFactor,
@@ -393,6 +397,9 @@ int register_android_view_InputWindowHandle(JNIEnv* env) { 


    GET_FIELD_ID(gInputWindowHandleClassInfo.frame, clazz, "frame", "Landroid/graphics/Rect;");



    GET_FIELD_ID(gInputWindowHandleClassInfo.contentSize, clazz, "contentSize",

                 "Landroid/util/Size;");



    GET_FIELD_ID(gInputWindowHandleClassInfo.surfaceInset, clazz,

            "surfaceInset", "I");

core/jni/jni_common.cpp

+14 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ static struct { 
    jfieldID top;

} gRectClassInfo;



static struct {

    jclass clazz;

    jmethodID ctor;

} gSizeClassInfo;



Rect JNICommon::rectFromObj(JNIEnv* env, jobject rectObj) {

    int left = env->GetIntField(rectObj, gRectClassInfo.left);

    int top = env->GetIntField(rectObj, gRectClassInfo.top);
@@ -47,6 +52,10 @@ jobject JNICommon::objFromRect(JNIEnv* env, Rect rect) { 
                          rect.right, rect.bottom);

}



jobject JNICommon::objFromSize(JNIEnv* env, Size size) {

    return env->NewObject(gSizeClassInfo.clazz, gSizeClassInfo.ctor, size.width, size.height);

}



int register_jni_common(JNIEnv* env) {

    jclass rectClazz = FindClassOrDie(env, "android/graphics/Rect");

    gRectClassInfo.clazz = MakeGlobalRefOrDie(env, rectClazz);
@@ -55,6 +64,11 @@ int register_jni_common(JNIEnv* env) { 
    gRectClassInfo.left = GetFieldIDOrDie(env, rectClazz, "left", "I");

    gRectClassInfo.right = GetFieldIDOrDie(env, rectClazz, "right", "I");

    gRectClassInfo.top = GetFieldIDOrDie(env, rectClazz, "top", "I");



    jclass sizeClazz = FindClassOrDie(env, "android/util/Size");

    gSizeClassInfo.clazz = MakeGlobalRefOrDie(env, sizeClazz);

    gSizeClassInfo.ctor = GetMethodIDOrDie(env, sizeClazz, "<init>", "(II)V");



    return 0;

}

core/jni/jni_common.h

+3 −0
Original line number Diff line number Diff line
@@ -14,14 +14,17 @@ 
 * limitations under the License.

 */

#include <jni.h>

#include <ui/Size.h>



namespace android {



class Rect;

using ui::Size;



class JNICommon {

public:

    static Rect rectFromObj(JNIEnv* env, jobject rectObj);

    static jobject objFromRect(JNIEnv* env, Rect rect);

    static jobject objFromSize(JNIEnv* env, Size size);

};

} // namespace android
 
 No newline at end of file