Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add isClone to InputWindowHandle" into tm-dev

Browse Source
This commit is contained in:
Chavi Weingarten
2022-05-24 16:57:32 +00:00
committed by Android (Google) Code Review
parent 811e3c9d08 1dc168ad2c
commit 96f4a2afc2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/InputWindowHandle.java
View File

@@ -157,6 +157,11 @@ public final class InputWindowHandle {
*/ */
public Matrix transform; public Matrix transform;
/**
* Whether this window is a clone or the original window.
*/
public boolean isClone;
private native void nativeDispose(); private native void nativeDispose();
public InputWindowHandle(InputApplicationHandle inputApplicationHandle, int displayId) { public InputWindowHandle(InputApplicationHandle inputApplicationHandle, int displayId) {

5
core/jni/android_hardware_input_InputWindowHandle.cpp
View File

@@ -74,6 +74,7 @@ static struct {
WeakRefHandleField touchableRegionSurfaceControl; WeakRefHandleField touchableRegionSurfaceControl;
jfieldID transform; jfieldID transform;
jfieldID windowToken; jfieldID windowToken;
jfieldID isClone;
} gInputWindowHandleClassInfo; } gInputWindowHandleClassInfo;
static struct { static struct {
@@ -317,6 +318,8 @@ jobject android_view_InputWindowHandle_fromWindowInfo(JNIEnv* env, gui::WindowIn
env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.windowToken, env->SetObjectField(inputWindowHandle, gInputWindowHandleClassInfo.windowToken,
javaObjectForIBinder(env, windowInfo.windowToken)); javaObjectForIBinder(env, windowInfo.windowToken));
env->SetBooleanField(inputWindowHandle, gInputWindowHandleClassInfo.isClone,
windowInfo.isClone);
return inputWindowHandle; return inputWindowHandle;
} }
@@ -433,6 +436,8 @@ int register_android_view_InputWindowHandle(JNIEnv* env) {
GET_FIELD_ID(gInputWindowHandleClassInfo.windowToken, clazz, "windowToken", GET_FIELD_ID(gInputWindowHandleClassInfo.windowToken, clazz, "windowToken",
"Landroid/os/IBinder;"); "Landroid/os/IBinder;");
GET_FIELD_ID(gInputWindowHandleClassInfo.isClone, clazz, "isClone", "Z");
jclass weakRefClazz; jclass weakRefClazz;
FIND_CLASS(weakRefClazz, "java/lang/ref/Reference"); FIND_CLASS(weakRefClazz, "java/lang/ref/Reference");