RelativeLayout: copy AOSP implementation

As we already support custom ViewGroups, there is no need to reimplement
this highly complex class.
This commit is contained in:
Julian Winkler
2023-09-01 13:18:02 +02:00
parent 9ad77d5b62
commit a35879c633
4 changed files with 1673 additions and 283 deletions

View File

@@ -74,7 +74,6 @@ libtranslationlayer_so = shared_library('translation_layer_main', [
'src/api-impl-jni/widgets/android_widget_Button.c',
'src/api-impl-jni/widgets/android_widget_EditText.c',
'src/api-impl-jni/widgets/android_widget_ImageButton.c',
'src/api-impl-jni/widgets/android_widget_RelativeLayout.c',
'src/api-impl-jni/widgets/android_widget_ScrollView.c',
'src/api-impl-jni/widgets/android_opengl_GLSurfaceView.c',
'src/api-impl-jni/widgets/android_widget_ImageView.c',

View File

@@ -1,229 +0,0 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
/* Header for class android_widget_RelativeLayout */
#ifndef _Included_android_widget_RelativeLayout
#define _Included_android_widget_RelativeLayout
#ifdef __cplusplus
extern "C" {
#endif
#undef android_widget_RelativeLayout_NO_ID
#define android_widget_RelativeLayout_NO_ID -1L
#undef android_widget_RelativeLayout_NOT_FOCUSABLE
#define android_widget_RelativeLayout_NOT_FOCUSABLE 0L
#undef android_widget_RelativeLayout_FOCUSABLE
#define android_widget_RelativeLayout_FOCUSABLE 1L
#undef android_widget_RelativeLayout_FOCUSABLE_MASK
#define android_widget_RelativeLayout_FOCUSABLE_MASK 1L
#undef android_widget_RelativeLayout_FITS_SYSTEM_WINDOWS
#define android_widget_RelativeLayout_FITS_SYSTEM_WINDOWS 2L
#undef android_widget_RelativeLayout_VISIBLE
#define android_widget_RelativeLayout_VISIBLE 0L
#undef android_widget_RelativeLayout_INVISIBLE
#define android_widget_RelativeLayout_INVISIBLE 4L
#undef android_widget_RelativeLayout_GONE
#define android_widget_RelativeLayout_GONE 8L
#undef android_widget_RelativeLayout_VISIBILITY_MASK
#define android_widget_RelativeLayout_VISIBILITY_MASK 12L
#undef android_widget_RelativeLayout_ENABLED
#define android_widget_RelativeLayout_ENABLED 0L
#undef android_widget_RelativeLayout_DISABLED
#define android_widget_RelativeLayout_DISABLED 32L
#undef android_widget_RelativeLayout_ENABLED_MASK
#define android_widget_RelativeLayout_ENABLED_MASK 32L
#undef android_widget_RelativeLayout_WILL_NOT_DRAW
#define android_widget_RelativeLayout_WILL_NOT_DRAW 128L
#undef android_widget_RelativeLayout_DRAW_MASK
#define android_widget_RelativeLayout_DRAW_MASK 128L
#undef android_widget_RelativeLayout_SCROLLBARS_NONE
#define android_widget_RelativeLayout_SCROLLBARS_NONE 0L
#undef android_widget_RelativeLayout_SCROLLBARS_HORIZONTAL
#define android_widget_RelativeLayout_SCROLLBARS_HORIZONTAL 256L
#undef android_widget_RelativeLayout_SCROLLBARS_VERTICAL
#define android_widget_RelativeLayout_SCROLLBARS_VERTICAL 512L
#undef android_widget_RelativeLayout_SCROLLBARS_MASK
#define android_widget_RelativeLayout_SCROLLBARS_MASK 768L
#undef android_widget_RelativeLayout_FILTER_TOUCHES_WHEN_OBSCURED
#define android_widget_RelativeLayout_FILTER_TOUCHES_WHEN_OBSCURED 1024L
#undef android_widget_RelativeLayout_OPTIONAL_FITS_SYSTEM_WINDOWS
#define android_widget_RelativeLayout_OPTIONAL_FITS_SYSTEM_WINDOWS 2048L
#undef android_widget_RelativeLayout_FADING_EDGE_NONE
#define android_widget_RelativeLayout_FADING_EDGE_NONE 0L
#undef android_widget_RelativeLayout_FADING_EDGE_HORIZONTAL
#define android_widget_RelativeLayout_FADING_EDGE_HORIZONTAL 4096L
#undef android_widget_RelativeLayout_FADING_EDGE_VERTICAL
#define android_widget_RelativeLayout_FADING_EDGE_VERTICAL 8192L
#undef android_widget_RelativeLayout_FADING_EDGE_MASK
#define android_widget_RelativeLayout_FADING_EDGE_MASK 12288L
#undef android_widget_RelativeLayout_CLICKABLE
#define android_widget_RelativeLayout_CLICKABLE 16384L
#undef android_widget_RelativeLayout_DRAWING_CACHE_ENABLED
#define android_widget_RelativeLayout_DRAWING_CACHE_ENABLED 32768L
#undef android_widget_RelativeLayout_SAVE_DISABLED
#define android_widget_RelativeLayout_SAVE_DISABLED 65536L
#undef android_widget_RelativeLayout_SAVE_DISABLED_MASK
#define android_widget_RelativeLayout_SAVE_DISABLED_MASK 65536L
#undef android_widget_RelativeLayout_WILL_NOT_CACHE_DRAWING
#define android_widget_RelativeLayout_WILL_NOT_CACHE_DRAWING 131072L
#undef android_widget_RelativeLayout_FOCUSABLE_IN_TOUCH_MODE
#define android_widget_RelativeLayout_FOCUSABLE_IN_TOUCH_MODE 262144L
#undef android_widget_RelativeLayout_DRAWING_CACHE_QUALITY_LOW
#define android_widget_RelativeLayout_DRAWING_CACHE_QUALITY_LOW 524288L
#undef android_widget_RelativeLayout_DRAWING_CACHE_QUALITY_HIGH
#define android_widget_RelativeLayout_DRAWING_CACHE_QUALITY_HIGH 1048576L
#undef android_widget_RelativeLayout_DRAWING_CACHE_QUALITY_AUTO
#define android_widget_RelativeLayout_DRAWING_CACHE_QUALITY_AUTO 0L
#undef android_widget_RelativeLayout_DRAWING_CACHE_QUALITY_MASK
#define android_widget_RelativeLayout_DRAWING_CACHE_QUALITY_MASK 1572864L
#undef android_widget_RelativeLayout_LONG_CLICKABLE
#define android_widget_RelativeLayout_LONG_CLICKABLE 2097152L
#undef android_widget_RelativeLayout_DUPLICATE_PARENT_STATE
#define android_widget_RelativeLayout_DUPLICATE_PARENT_STATE 4194304L
#undef android_widget_RelativeLayout_SCROLLBARS_INSIDE_OVERLAY
#define android_widget_RelativeLayout_SCROLLBARS_INSIDE_OVERLAY 0L
#undef android_widget_RelativeLayout_SCROLLBARS_INSIDE_INSET
#define android_widget_RelativeLayout_SCROLLBARS_INSIDE_INSET 16777216L
#undef android_widget_RelativeLayout_SCROLLBARS_OUTSIDE_OVERLAY
#define android_widget_RelativeLayout_SCROLLBARS_OUTSIDE_OVERLAY 33554432L
#undef android_widget_RelativeLayout_SCROLLBARS_OUTSIDE_INSET
#define android_widget_RelativeLayout_SCROLLBARS_OUTSIDE_INSET 50331648L
#undef android_widget_RelativeLayout_SCROLLBARS_INSET_MASK
#define android_widget_RelativeLayout_SCROLLBARS_INSET_MASK 16777216L
#undef android_widget_RelativeLayout_SCROLLBARS_OUTSIDE_MASK
#define android_widget_RelativeLayout_SCROLLBARS_OUTSIDE_MASK 33554432L
#undef android_widget_RelativeLayout_SCROLLBARS_STYLE_MASK
#define android_widget_RelativeLayout_SCROLLBARS_STYLE_MASK 50331648L
#undef android_widget_RelativeLayout_KEEP_SCREEN_ON
#define android_widget_RelativeLayout_KEEP_SCREEN_ON 67108864L
#undef android_widget_RelativeLayout_SOUND_EFFECTS_ENABLED
#define android_widget_RelativeLayout_SOUND_EFFECTS_ENABLED 134217728L
#undef android_widget_RelativeLayout_HAPTIC_FEEDBACK_ENABLED
#define android_widget_RelativeLayout_HAPTIC_FEEDBACK_ENABLED 268435456L
#undef android_widget_RelativeLayout_PARENT_SAVE_DISABLED
#define android_widget_RelativeLayout_PARENT_SAVE_DISABLED 536870912L
#undef android_widget_RelativeLayout_PARENT_SAVE_DISABLED_MASK
#define android_widget_RelativeLayout_PARENT_SAVE_DISABLED_MASK 536870912L
#undef android_widget_RelativeLayout_FOCUSABLES_ALL
#define android_widget_RelativeLayout_FOCUSABLES_ALL 0L
#undef android_widget_RelativeLayout_FOCUSABLES_TOUCH_MODE
#define android_widget_RelativeLayout_FOCUSABLES_TOUCH_MODE 1L
#undef android_widget_RelativeLayout_FOCUS_BACKWARD
#define android_widget_RelativeLayout_FOCUS_BACKWARD 1L
#undef android_widget_RelativeLayout_FOCUS_FORWARD
#define android_widget_RelativeLayout_FOCUS_FORWARD 2L
#undef android_widget_RelativeLayout_FOCUS_LEFT
#define android_widget_RelativeLayout_FOCUS_LEFT 17L
#undef android_widget_RelativeLayout_FOCUS_UP
#define android_widget_RelativeLayout_FOCUS_UP 33L
#undef android_widget_RelativeLayout_FOCUS_RIGHT
#define android_widget_RelativeLayout_FOCUS_RIGHT 66L
#undef android_widget_RelativeLayout_FOCUS_DOWN
#define android_widget_RelativeLayout_FOCUS_DOWN 130L
#undef android_widget_RelativeLayout_MEASURED_SIZE_MASK
#define android_widget_RelativeLayout_MEASURED_SIZE_MASK 16777215L
#undef android_widget_RelativeLayout_MEASURED_STATE_MASK
#define android_widget_RelativeLayout_MEASURED_STATE_MASK -16777216L
#undef android_widget_RelativeLayout_MEASURED_HEIGHT_STATE_SHIFT
#define android_widget_RelativeLayout_MEASURED_HEIGHT_STATE_SHIFT 16L
#undef android_widget_RelativeLayout_MEASURED_STATE_TOO_SMALL
#define android_widget_RelativeLayout_MEASURED_STATE_TOO_SMALL 16777216L
#undef android_widget_RelativeLayout_PFLAG2_DRAG_CAN_ACCEPT
#define android_widget_RelativeLayout_PFLAG2_DRAG_CAN_ACCEPT 1L
#undef android_widget_RelativeLayout_PFLAG2_DRAG_HOVERED
#define android_widget_RelativeLayout_PFLAG2_DRAG_HOVERED 2L
#undef android_widget_RelativeLayout_LAYOUT_DIRECTION_LTR
#define android_widget_RelativeLayout_LAYOUT_DIRECTION_LTR 0L
#undef android_widget_RelativeLayout_LAYOUT_DIRECTION_RTL
#define android_widget_RelativeLayout_LAYOUT_DIRECTION_RTL 1L
#undef android_widget_RelativeLayout_LAYOUT_DIRECTION_INHERIT
#define android_widget_RelativeLayout_LAYOUT_DIRECTION_INHERIT 2L
#undef android_widget_RelativeLayout_LAYOUT_DIRECTION_LOCALE
#define android_widget_RelativeLayout_LAYOUT_DIRECTION_LOCALE 3L
#undef android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT
#define android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT 2L
#undef android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_MASK
#define android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_MASK 12L
#undef android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_RESOLVED_RTL
#define android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_RESOLVED_RTL 16L
#undef android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_RESOLVED
#define android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_RESOLVED 32L
#undef android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_RESOLVED_MASK
#define android_widget_RelativeLayout_PFLAG2_LAYOUT_DIRECTION_RESOLVED_MASK 48L
#undef android_widget_RelativeLayout_STATUS_BAR_HIDDEN
#define android_widget_RelativeLayout_STATUS_BAR_HIDDEN 1L
#undef android_widget_RelativeLayout_STATUS_BAR_VISIBLE
#define android_widget_RelativeLayout_STATUS_BAR_VISIBLE 0L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_FULLSCREEN
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_FULLSCREEN 4L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_HIDE_NAVIGATION
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_HIDE_NAVIGATION 2L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_IMMERSIVE
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_IMMERSIVE 2048L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_IMMERSIVE_STICKY
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_IMMERSIVE_STICKY 4096L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN 1024L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION 512L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_LAYOUT_STABLE
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_LAYOUT_STABLE 256L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_LOW_PROFILE
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_LOW_PROFILE 1L
#undef android_widget_RelativeLayout_SYSTEM_UI_FLAG_VISIBLE
#define android_widget_RelativeLayout_SYSTEM_UI_FLAG_VISIBLE 0L
#undef android_widget_RelativeLayout_SYSTEM_UI_LAYOUT_FLAGS
#define android_widget_RelativeLayout_SYSTEM_UI_LAYOUT_FLAGS 1536L
#undef android_widget_RelativeLayout_TEXT_ALIGNMENT_CENTER
#define android_widget_RelativeLayout_TEXT_ALIGNMENT_CENTER 4L
#undef android_widget_RelativeLayout_TEXT_ALIGNMENT_GRAVITY
#define android_widget_RelativeLayout_TEXT_ALIGNMENT_GRAVITY 1L
#undef android_widget_RelativeLayout_TEXT_ALIGNMENT_INHERIT
#define android_widget_RelativeLayout_TEXT_ALIGNMENT_INHERIT 0L
#undef android_widget_RelativeLayout_TEXT_ALIGNMENT_TEXT_END
#define android_widget_RelativeLayout_TEXT_ALIGNMENT_TEXT_END 3L
#undef android_widget_RelativeLayout_TEXT_ALIGNMENT_TEXT_START
#define android_widget_RelativeLayout_TEXT_ALIGNMENT_TEXT_START 2L
#undef android_widget_RelativeLayout_TEXT_ALIGNMENT_VIEW_END
#define android_widget_RelativeLayout_TEXT_ALIGNMENT_VIEW_END 6L
#undef android_widget_RelativeLayout_TEXT_ALIGNMENT_VIEW_START
#define android_widget_RelativeLayout_TEXT_ALIGNMENT_VIEW_START 5L
#undef android_widget_RelativeLayout_TEXT_DIRECTION_ANY_RTL
#define android_widget_RelativeLayout_TEXT_DIRECTION_ANY_RTL 2L
#undef android_widget_RelativeLayout_TEXT_DIRECTION_FIRST_STRONG
#define android_widget_RelativeLayout_TEXT_DIRECTION_FIRST_STRONG 1L
#undef android_widget_RelativeLayout_TEXT_DIRECTION_INHERIT
#define android_widget_RelativeLayout_TEXT_DIRECTION_INHERIT 0L
#undef android_widget_RelativeLayout_TEXT_DIRECTION_LOCALE
#define android_widget_RelativeLayout_TEXT_DIRECTION_LOCALE 5L
#undef android_widget_RelativeLayout_TEXT_DIRECTION_LTR
#define android_widget_RelativeLayout_TEXT_DIRECTION_LTR 3L
#undef android_widget_RelativeLayout_TEXT_DIRECTION_RTL
#define android_widget_RelativeLayout_TEXT_DIRECTION_RTL 4L
/*
* Class: android_widget_RelativeLayout
* Method: native_constructor
* Signature: (Landroid/content/Context;Landroid/util/AttributeSet;)J
*/
JNIEXPORT jlong JNICALL Java_android_widget_RelativeLayout_native_1constructor
(JNIEnv *, jobject, jobject, jobject);
/*
* Class: android_widget_RelativeLayout
* Method: native_addView
* Signature: (JJILandroid/view/ViewGroup/LayoutParams;)V
*/
JNIEXPORT void JNICALL Java_android_widget_RelativeLayout_native_1addView
(JNIEnv *, jobject, jlong, jlong, jint, jobject);
/*
* Class: android_widget_RelativeLayout
* Method: native_removeView
* Signature: (JJ)V
*/
JNIEXPORT void JNICALL Java_android_widget_RelativeLayout_native_1removeView
(JNIEnv *, jobject, jlong, jlong);
#ifdef __cplusplus
}
#endif
#endif

View File

@@ -1,32 +0,0 @@
#include <gtk/gtk.h>
#include "../defines.h"
#include "../util.h"
#include "WrapperWidget.h"
#include "../generated_headers/android_widget_RelativeLayout.h"
#include "../generated_headers/android_view_ViewGroup.h"
// FIXME not a relative layout
JNIEXPORT jlong JNICALL Java_android_widget_RelativeLayout_native_1constructor(JNIEnv *env, jobject this, jobject context, jobject attrs)
{
int orientation = attribute_set_get_int(env, attrs, "orientation", NULL, 1);
GtkWidget *wrapper = g_object_ref(wrapper_widget_new());
GtkWidget *box = gtk_box_new(orientation ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, 1); // spacing of 1
wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), box);
gtk_widget_set_name(GTK_WIDGET(box), "RelativeLayout");
return _INTPTR(box);
}
JNIEXPORT void JNICALL Java_android_widget_RelativeLayout_native_1addView(JNIEnv *env, jobject this, jlong widget, jlong child, jint index, jobject layout_params)
{
gtk_box_append(GTK_BOX(_PTR(widget)), gtk_widget_get_parent(GTK_WIDGET(_PTR(child)))); // FIXME - ignores index argument
}
JNIEXPORT void JNICALL Java_android_widget_RelativeLayout_native_1removeView(JNIEnv *env, jobject this, jlong widget, jlong child)
{
gtk_box_remove(GTK_BOX(_PTR(widget)), gtk_widget_get_parent(GTK_WIDGET(_PTR(child))));
}

File diff suppressed because it is too large Load Diff