From 6103f1045420e3140bb2cbd6bd52232c6ea1da02 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 1 Sep 2013 20:05:44 +0300 Subject: [PATCH] Revert "Random changes to advertisement code" This reverts commit e3ff8b5e4d3d61560f83429102f90020184e2436. --- project/java/MainActivity.java | 10 +++------- project/jni/application/openarena/engine | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 8059804a5..68e287103 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -146,15 +146,12 @@ 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); @@ -295,8 +292,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; @@ -311,11 +308,10 @@ public class MainActivity extends Activity mGLView.setFocusableInTouchMode(true); mGLView.setFocusable(true); mGLView.requestFocus(); - _ad = new Advertisement(this); if( _ad.getView() != null ) { - _ad.getView().setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP | Gravity.RIGHT)); _videoLayout.addView(_ad.getView()); + _ad.getView().setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP | Gravity.RIGHT)); } // Receive keyboard events DimSystemStatusBar.get().dim(_videoLayout); diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index 87ea8e40a..c6164a2a5 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 87ea8e40a7c0f3e1ac9ec0c50b367fde5b756c58 +Subproject commit c6164a2a58d6a004ffbd54cf6e987e6ad2e74010