From 0614e6c2453172dcfc58e612b0be7463002e5dc2 Mon Sep 17 00:00:00 2001 From: Julian Winkler Date: Fri, 29 Dec 2023 11:09:37 +0100 Subject: [PATCH] add some stubs needed since we now handle onMeasure() for more Views --- .../generated_headers/android_widget_LinearLayout.h | 8 ++++++++ src/api-impl-jni/widgets/android_widget_LinearLayout.c | 5 +++++ src/api-impl/android/graphics/drawable/Drawable.java | 2 ++ src/api-impl/android/text/Layout.java | 2 ++ src/api-impl/android/view/View.java | 2 ++ src/api-impl/android/widget/LinearLayout.java | 3 +-- src/api-impl/android/widget/TextView.java | 5 +++++ 7 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/api-impl-jni/generated_headers/android_widget_LinearLayout.h b/src/api-impl-jni/generated_headers/android_widget_LinearLayout.h index 23858c63..f4b472ef 100644 --- a/src/api-impl-jni/generated_headers/android_widget_LinearLayout.h +++ b/src/api-impl-jni/generated_headers/android_widget_LinearLayout.h @@ -215,6 +215,14 @@ JNIEXPORT jlong JNICALL Java_android_widget_LinearLayout_native_1constructor JNIEXPORT void JNICALL Java_android_widget_LinearLayout_setOrientation (JNIEnv *, jobject, jint); +/* + * Class: android_widget_LinearLayout + * Method: getOrientation + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_android_widget_LinearLayout_getOrientation + (JNIEnv *, jobject); + #ifdef __cplusplus } #endif diff --git a/src/api-impl-jni/widgets/android_widget_LinearLayout.c b/src/api-impl-jni/widgets/android_widget_LinearLayout.c index 4e42b6a0..b0573359 100644 --- a/src/api-impl-jni/widgets/android_widget_LinearLayout.c +++ b/src/api-impl-jni/widgets/android_widget_LinearLayout.c @@ -45,3 +45,8 @@ JNIEXPORT void JNICALL Java_android_widget_LinearLayout_setOrientation(JNIEnv *e { gtk_orientable_set_orientation(GTK_ORIENTABLE(_PTR(_GET_LONG_FIELD(this, "widget"))), orientation ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL); } + +JNIEXPORT jint JNICALL Java_android_widget_LinearLayout_getOrientation(JNIEnv *env, jobject this) +{ + return gtk_orientable_get_orientation(GTK_ORIENTABLE(_PTR(_GET_LONG_FIELD(this, "widget")))); +} diff --git a/src/api-impl/android/graphics/drawable/Drawable.java b/src/api-impl/android/graphics/drawable/Drawable.java index ee0be7fd..27fa726e 100644 --- a/src/api-impl/android/graphics/drawable/Drawable.java +++ b/src/api-impl/android/graphics/drawable/Drawable.java @@ -87,4 +87,6 @@ public abstract class Drawable { } public void setTintMode(PorterDuff.Mode tintMode) {} + + public boolean isProjected () {return false;} } diff --git a/src/api-impl/android/text/Layout.java b/src/api-impl/android/text/Layout.java index 3fd8e8d3..8884d4ed 100644 --- a/src/api-impl/android/text/Layout.java +++ b/src/api-impl/android/text/Layout.java @@ -9,4 +9,6 @@ public class Layout { ALIGN_LEFT, ALIGN_RIGHT, } + + public int getLineCount() {return 1;} } diff --git a/src/api-impl/android/view/View.java b/src/api-impl/android/view/View.java index 91347f93..86ab783a 100644 --- a/src/api-impl/android/view/View.java +++ b/src/api-impl/android/view/View.java @@ -1573,4 +1573,6 @@ public class View extends Object { protected int computeVerticalScrollExtent() { return getHeight(); } + + public void setAccessibilityLiveRegion(int mode) {} } diff --git a/src/api-impl/android/widget/LinearLayout.java b/src/api-impl/android/widget/LinearLayout.java index 004622be..e9316b09 100644 --- a/src/api-impl/android/widget/LinearLayout.java +++ b/src/api-impl/android/widget/LinearLayout.java @@ -6,8 +6,6 @@ import android.view.ViewGroup; public class LinearLayout extends ViewGroup { - boolean orientation; - public LinearLayout(Context context, AttributeSet attrs) { super(context, attrs); } @@ -20,6 +18,7 @@ public class LinearLayout extends ViewGroup { protected native long native_constructor(Context context, AttributeSet attrs); public native void setOrientation(int orientation); + public native int getOrientation(); public void setWeightSum(float weightSum) {} @Override diff --git a/src/api-impl/android/widget/TextView.java b/src/api-impl/android/widget/TextView.java index 7be472d5..aebaf6ca 100644 --- a/src/api-impl/android/widget/TextView.java +++ b/src/api-impl/android/widget/TextView.java @@ -7,6 +7,7 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.text.Editable; import android.text.InputFilter; +import android.text.Layout; import android.text.TextPaint; import android.text.TextUtils; import android.text.TextWatcher; @@ -193,4 +194,8 @@ public class TextView extends View { NORMAL, SPANNABLE, } + + public Layout getLayout() { + return new Layout(); + } }