From e3ff8b5e4d3d61560f83429102f90020184e2436 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 25 Aug 2013 19:42:58 +0300 Subject: [PATCH] Random changes to advertisement code --- project/java/MainActivity.java | 11 ++++++++--- project/jni/application/openarena/engine | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 5a5954251..90aac79d9 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -145,12 +145,15 @@ public class MainActivity extends Activity _videoLayout = new FrameLayout(this); _videoLayout.addView(_layout); + // Do not show advertisement in SDL menu + /* _ad = new Advertisement(this); if( _ad.getView() != null ) { _videoLayout.addView(_ad.getView()); _ad.getView().setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM | Gravity.RIGHT)); } + */ setContentView(_videoLayout); @@ -291,8 +294,8 @@ public class MainActivity extends Activity sdlInited = true; _videoLayout.removeView(_layout); - if( _ad.getView() != null ) - _videoLayout.removeView(_ad.getView()); + //if( _ad.getView() != null ) + // _videoLayout.removeView(_ad.getView()); _layout = null; _layout2 = null; _btn = null; @@ -307,10 +310,11 @@ public class MainActivity extends Activity mGLView.setFocusableInTouchMode(true); mGLView.setFocusable(true); mGLView.requestFocus(); + _ad = new Advertisement(this); if( _ad.getView() != null ) { - _videoLayout.addView(_ad.getView()); _ad.getView().setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP | Gravity.RIGHT)); + _videoLayout.addView(_ad.getView()); } // Receive keyboard events DimSystemStatusBar.get().dim(_videoLayout); @@ -489,6 +493,7 @@ public class MainActivity extends Activity _screenKeyboard.setFocusable(true); _screenKeyboard.requestFocus(); _inputManager.showSoftInput(_screenKeyboard, InputMethodManager.SHOW_IMPLICIT); + }; public void hideScreenKeyboard() diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index c6164a2a5..87ea8e40a 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit c6164a2a58d6a004ffbd54cf6e987e6ad2e74010 +Subproject commit 87ea8e40a7c0f3e1ac9ec0c50b367fde5b756c58