lib/android: in Java, use Activity instead of NativeActivity

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/examples/mnit_simple/src/simple_android.nit b/examples/mnit_simple/src/simple_android.nit
index b108f8b..8d5a296 100644 (file)
--- a/examples/mnit_simple/src/simple_android.nit
+++ b/examples/mnit_simple/src/simple_android.nit
@@ -43,8 +43,7 @@ redef class App
                android.util.Log.d("mnit_simple", "Java within NIT!!!");
 
                // - Context needed from now on
-               // NativeActivity is a Java sub-class of Context
-               final android.app.NativeActivity context = App_native_activity(recv);
+               final android.app.Activity context = App_native_activity(recv);
 
                // Vibration
                android.os.Vibrator v = (android.os.Vibrator)

diff --git a/lib/android/ui.nit b/lib/android/ui.nit
index ae5d572..a07718e 100644 (file)
--- a/lib/android/ui.nit
+++ b/lib/android/ui.nit
@@ -38,7 +38,7 @@ import native_app_glue
 import pthreads::concurrent_collections
 
 in "Java" `{
-       import android.app.NativeActivity;
+       import android.app.Activity;
 
        import android.view.Gravity;
        import android.view.MotionEvent;
@@ -115,7 +115,7 @@ redef extern class NativeActivity
                final LinearLayout final_main_layout = new LinearLayout(recv);
                final ViewGroup final_popup_layout = popup_layout;
                final PopupWindow final_popup = popup;
-               final NativeActivity final_recv = recv;
+               final Activity final_recv = recv;
 
                recv.runOnUiThread(new Runnable() {
                        @Override
@@ -144,7 +144,7 @@ redef extern class NativeActivity
        # TODO bring use this instead of the hack with `dedicate_to_pupup`
        private fun real_content_view=(layout: NativeViewGroup) in "Java" `{
                final ViewGroup final_layout = layout;
-               final NativeActivity final_recv = recv;
+               final Activity final_recv = recv;
 
                recv.runOnUiThread(new Runnable() {
                        @Override
@@ -334,7 +334,7 @@ extern class NativeTextView in "Java" `{ android.widget.TextView `}
                final TextView final_recv = recv;
                final String final_value = value;
 
-               ((NativeActivity)recv.getContext()).runOnUiThread(new Runnable() {
+               ((Activity)recv.getContext()).runOnUiThread(new Runnable() {
                        @Override
                        public void run()  {
                                final_recv.setText(final_value);
@@ -347,7 +347,7 @@ extern class NativeTextView in "Java" `{ android.widget.TextView `}
                final TextView final_recv = recv;
                final boolean final_value = value;
 
-               ((NativeActivity)recv.getContext()).runOnUiThread(new Runnable() {
+               ((Activity)recv.getContext()).runOnUiThread(new Runnable() {
                        @Override
                        public void run()  {
                                final_recv.setEnabled(final_value);