diff --git a/src/api-impl-jni/generated_headers/android_app_NativeActivity.h b/src/api-impl-jni/generated_headers/android_app_NativeActivity.h index 2ec18112..312fba17 100644 --- a/src/api-impl-jni/generated_headers/android_app_NativeActivity.h +++ b/src/api-impl-jni/generated_headers/android_app_NativeActivity.h @@ -7,6 +7,8 @@ #ifdef __cplusplus extern "C" { #endif +#undef android_app_NativeActivity_MODE_PRIVATE +#define android_app_NativeActivity_MODE_PRIVATE 0L /* * Class: android_app_NativeActivity * Method: loadNativeCode diff --git a/src/api-impl/android/content/DialogInterface.java b/src/api-impl/android/content/DialogInterface.java index c650bbad..53ff4238 100644 --- a/src/api-impl/android/content/DialogInterface.java +++ b/src/api-impl/android/content/DialogInterface.java @@ -5,4 +5,6 @@ public interface DialogInterface { } public interface OnClickListener { } + public interface OnShowListener { + } } diff --git a/src/api-impl/android/net/Uri.java b/src/api-impl/android/net/Uri.java index 371dab3c..ce4750c4 100644 --- a/src/api-impl/android/net/Uri.java +++ b/src/api-impl/android/net/Uri.java @@ -1,5 +1,7 @@ package android.net; public class Uri { - + public static Uri parse(String s) { + return new Uri(); + } } diff --git a/src/api-impl/android/opengl/GLSurfaceView.java b/src/api-impl/android/opengl/GLSurfaceView.java index 1f02eacd..f42510c7 100644 --- a/src/api-impl/android/opengl/GLSurfaceView.java +++ b/src/api-impl/android/opengl/GLSurfaceView.java @@ -17,7 +17,11 @@ import android.view.MotionEvent; import android.view.SurfaceHolder; -public class GLSurfaceView extends View implements SurfaceHolder.Callback { // TODO: have this extend SurfaceView once that one is implemented? +import android.view.Surface; +import android.graphics.Canvas; +import android.graphics.Rect; + +public class GLSurfaceView extends View implements SurfaceHolder.Callback { // TODO: have this extend SurfaceView? EGLContextFactory context_factory = new default_ContextFactory(); EGLConfigChooser config_chooser = new boolean_ConfigChooser(true); EGL10 java_egl_wrapper; @@ -146,6 +150,26 @@ public class GLSurfaceView extends View implements SurfaceHolder.Callback { // T r.run(); } + private class DummySurfaceHolder implements SurfaceHolder { + public void addCallback(Callback callback) {} + public void removeCallback(Callback callback) {} + public boolean isCreating() {return false;} + public void setType(int type) {} + public void setFixedSize(int width, int height) {} + public void setSizeFromLayout() {} + public void setFormat(int format) {} + public void setKeepScreenOn(boolean screenOn) {} + public Canvas lockCanvas() {return null;} + public Canvas lockCanvas(Rect dirty) {return null;} + public void unlockCanvasAndPost(Canvas canvas) {} + public Rect getSurfaceFrame() {return null;} + public Surface getSurface() {return null;} + } + + public SurfaceHolder getHolder() { + return (SurfaceHolder) new DummySurfaceHolder(); + } + private static class boolean_ConfigChooser implements GLSurfaceView.EGLConfigChooser { // TODO - what happens if we actually allow for 16 bits per color? private static int[] config_attribs_no_depth = {EGL10.EGL_RED_SIZE, 8, EGL10.EGL_GREEN_SIZE, 8, EGL10.EGL_BLUE_SIZE, 8, EGL10.EGL_ALPHA_SIZE, 0, EGL10.EGL_DEPTH_SIZE, 0, EGL10.EGL_STENCIL_SIZE, 0, EGL10.EGL_NONE}; diff --git a/src/api-impl/android/util/Log.java b/src/api-impl/android/util/Log.java index 5adfceb2..39851aea 100644 --- a/src/api-impl/android/util/Log.java +++ b/src/api-impl/android/util/Log.java @@ -207,7 +207,7 @@ public final class Log { * @return Whether or not that this is allowed to be logged. * @throws IllegalArgumentException is thrown if the tag.length() > 23. */ - public static native boolean isLoggable(String tag, int level); + public static /*native*/ boolean isLoggable(String tag, int level) {return true;} // should be fiiiine? /* * Send a {@link #WARN} log message and log the exception. diff --git a/src/api-impl/android/view/View.java b/src/api-impl/android/view/View.java index 9abbeddb..f5ccc8c0 100644 --- a/src/api-impl/android/view/View.java +++ b/src/api-impl/android/view/View.java @@ -7,6 +7,8 @@ import android.content.res.Resources; import android.graphics.Rect; import android.graphics.Canvas; +import android.os.IBinder; + import java.util.HashMap; public class View extends Object { @@ -858,4 +860,16 @@ public class View extends Object { } public void setOnGenericMotionListener (View.OnGenericMotionListener l) {} + + public IBinder getWindowToken() { + return new IBinder(); + } + + public void getLocationInWindow(int[] xxx) {} + + public void addOnAttachStateChangeListener(OnAttachStateChangeListener l) {} + + public Context getContext() { + return this.context; + } } diff --git a/src/api-impl/android/widget/ImageView.java b/src/api-impl/android/widget/ImageView.java index 64af32db..ae791d72 100644 --- a/src/api-impl/android/widget/ImageView.java +++ b/src/api-impl/android/widget/ImageView.java @@ -18,6 +18,12 @@ public class ImageView extends View { native_constructor(context); } + public ImageView(Context context, AttributeSet attrs, int xxx) { + super(context); + + native_constructor(context); + } + private native void native_constructor(AttributeSet attrs); private native void native_constructor(Context context);