diff --git a/src/api-impl-jni/views/AndroidLayout.c b/src/api-impl-jni/views/AndroidLayout.c index fea5bdf7..3ab9afc8 100644 --- a/src/api-impl-jni/views/AndroidLayout.c +++ b/src/api-impl-jni/views/AndroidLayout.c @@ -48,11 +48,10 @@ static void android_layout_measure(GtkLayoutManager *layout_manager, GtkWidget * *natural = (*env)->CallIntMethod(env, layout->view, handle_cache.view.getMeasuredWidth); *minimum = heightMeasureSpec && !widthMeasureSpec ? *natural : (*env)->CallIntMethod(env, layout->view, handle_cache.view.getSuggestedMinimumWidth); - } - if (orientation == GTK_ORIENTATION_VERTICAL) { + } else if (orientation == GTK_ORIENTATION_VERTICAL) { *natural = (*env)->CallIntMethod(env, layout->view, handle_cache.view.getMeasuredHeight); *minimum = widthMeasureSpec && !heightMeasureSpec ? *natural - :(*env)->CallIntMethod(env, layout->view, handle_cache.view.getSuggestedMinimumHeight); + : (*env)->CallIntMethod(env, layout->view, handle_cache.view.getSuggestedMinimumHeight); } if (*natural < *minimum) *natural = *minimum; diff --git a/src/api-impl/android/app/Dialog.java b/src/api-impl/android/app/Dialog.java index 410d6269..732744fd 100644 --- a/src/api-impl/android/app/Dialog.java +++ b/src/api-impl/android/app/Dialog.java @@ -177,6 +177,8 @@ public class Dialog implements Window.Callback, DialogInterface { public void setCancelMessage(Message msg) {} + public void setDismissMessage(Message msg) {} + public boolean onTouchEvent(MotionEvent event) { return false; } diff --git a/src/api-impl/android/content/ServiceConnection.java b/src/api-impl/android/content/ServiceConnection.java index ed1a8ef5..bd0b5742 100644 --- a/src/api-impl/android/content/ServiceConnection.java +++ b/src/api-impl/android/content/ServiceConnection.java @@ -3,6 +3,5 @@ package android.content; import android.os.IBinder; public interface ServiceConnection { - public void onServiceConnected (ComponentName name, IBinder service); } diff --git a/src/api-impl/android/widget/PopupWindow.java b/src/api-impl/android/widget/PopupWindow.java index e968a275..4573cbf2 100644 --- a/src/api-impl/android/widget/PopupWindow.java +++ b/src/api-impl/android/widget/PopupWindow.java @@ -172,6 +172,9 @@ public class PopupWindow { return native_isTouchable(popover); } + public void setOverlapAnchor(boolean overlap) { + } + protected native long native_constructor(); protected native void native_setContentView(long widget, long contentView); protected native void native_showAsDropDown(long widget, long anchor, int xoff, int yoff, int gravity);