diff --git a/src/api-impl-jni/views/android_view_View.c b/src/api-impl-jni/views/android_view_View.c index 35624d7a..7f675c0d 100644 --- a/src/api-impl-jni/views/android_view_View.c +++ b/src/api-impl-jni/views/android_view_View.c @@ -105,7 +105,7 @@ void _setOnTouchListener(JNIEnv *env, jobject this, GtkWidget *widget, jobject o gtk_widget_remove_controller(widget, old_controller); GtkEventController *controller = GTK_EVENT_CONTROLLER(gtk_event_controller_legacy_new()); - gtk_event_controller_set_propagation_phase(controller, GTK_PHASE_CAPTURE); // FIXME? + gtk_event_controller_set_propagation_phase(controller, GTK_PHASE_BUBBLE); g_signal_connect(controller, "event", G_CALLBACK(on_event), callback_data); gtk_widget_add_controller(widget, controller); diff --git a/src/api-impl-jni/views/android_view_ViewGroup.c b/src/api-impl-jni/views/android_view_ViewGroup.c index dc7f4aff..4ec82eeb 100644 --- a/src/api-impl-jni/views/android_view_ViewGroup.c +++ b/src/api-impl-jni/views/android_view_ViewGroup.c @@ -89,6 +89,7 @@ JNIEXPORT jlong JNICALL Java_android_view_ViewGroup_native_1constructor(JNIEnv * GtkWidget *wrapper = g_object_ref(wrapper_widget_new()); GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1); // spacing of 1 wrapper_widget_set_child(WRAPPER_WIDGET(wrapper), box); + wrapper_widget_set_jobject(WRAPPER_WIDGET(wrapper), env, this); const char *name = _CSTRING((*env)->CallObjectMethod(env, _CLASS(this), _METHOD((*env)->FindClass(env, "java/lang/Class"), "getName", "()Ljava/lang/String;"))); diff --git a/src/api-impl/android/view/MotionEvent.java b/src/api-impl/android/view/MotionEvent.java index a4d1b72f..3b86279f 100644 --- a/src/api-impl/android/view/MotionEvent.java +++ b/src/api-impl/android/view/MotionEvent.java @@ -1991,7 +1991,7 @@ public final class MotionEvent extends InputEvent { * that pointer identifier. */ public final int findPointerIndex(int pointerId) { - return nativeFindPointerIndex(mNativePtr, pointerId); + return 0 /*nativeFindPointerIndex(mNativePtr, pointerId)*/; } /** diff --git a/src/api-impl/android/view/VelocityTracker.java b/src/api-impl/android/view/VelocityTracker.java index 352945f8..9a2d6e6d 100644 --- a/src/api-impl/android/view/VelocityTracker.java +++ b/src/api-impl/android/view/VelocityTracker.java @@ -9,4 +9,11 @@ public class VelocityTracker { public void addMovement(MotionEvent event) {} public void recycle() {} + + public void computeCurrentVelocity(int units, float maxVelocity) {} + + public float getXVelocity(int id) {return 0.f;} + public float getYVelocity(int id) {return 0.f;} + + public void clear() {} } diff --git a/src/api-impl/android/view/View.java b/src/api-impl/android/view/View.java index bbfcfea4..faa4bfc4 100644 --- a/src/api-impl/android/view/View.java +++ b/src/api-impl/android/view/View.java @@ -1520,4 +1520,6 @@ public class View extends Object { } public void setLayerType(int layerType, Paint paint) {} + + public float getZ() {return 0.f;} } diff --git a/src/api-impl/android/view/ViewGroup.java b/src/api-impl/android/view/ViewGroup.java index 413b16dd..79cd6b99 100644 --- a/src/api-impl/android/view/ViewGroup.java +++ b/src/api-impl/android/view/ViewGroup.java @@ -302,6 +302,13 @@ public class ViewGroup extends View implements ViewParent, ViewManager { } } + protected boolean isChildrenDrawingOrderEnabled() { return false; } + + @Override + public boolean onStartNestedScroll(View child, View target, int nestedScrollAxes) { + return false; + } + public static class LayoutParams { public static final int FILL_PARENT = -1; public static final int MATCH_PARENT = -1; diff --git a/src/api-impl/android/view/ViewParent.java b/src/api-impl/android/view/ViewParent.java index 6f1bf0e3..f9b54ebd 100644 --- a/src/api-impl/android/view/ViewParent.java +++ b/src/api-impl/android/view/ViewParent.java @@ -6,4 +6,6 @@ public interface ViewParent { public boolean isLayoutRequested(); public void requestDisallowInterceptTouchEvent(boolean disallowIntercept); + + public abstract boolean onStartNestedScroll(View child, View target, int nestedScrollAxes); } diff --git a/src/api-impl/android/widget/EdgeEffect.java b/src/api-impl/android/widget/EdgeEffect.java index 8d40b9a6..2f6a8573 100644 --- a/src/api-impl/android/widget/EdgeEffect.java +++ b/src/api-impl/android/widget/EdgeEffect.java @@ -18,5 +18,6 @@ public class EdgeEffect extends View { public void onPull(float deltaDistance) {} public void onPull(float deltaDistance, float displacement) {} public boolean isFinished() {return true;} + public void onRelease() {} } diff --git a/src/api-impl/android/widget/OverScroller.java b/src/api-impl/android/widget/OverScroller.java index 54a019c5..e272ad8c 100644 --- a/src/api-impl/android/widget/OverScroller.java +++ b/src/api-impl/android/widget/OverScroller.java @@ -22,4 +22,6 @@ public class OverScroller { public int getFinalX() {return 0;} public int getFinalY() {return 0;} + + public boolean isFinished() {return true;} }