From 2c67731a7be00ee80c14a2b75d4a0575dcccb05a Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Fri, 23 Nov 2012 13:12:11 +0400
Subject: [PATCH] Issue #2549 OpenCV Samples does not expand on full screen
 fixed.

All samples use application style in android manifest instead of system calls in onCreate event now.
---
 samples/android/15-puzzle/AndroidManifest.xml               | 3 ++-
 .../src/org/opencv/samples/puzzle15/Puzzle15Activity.java   | 4 ++--
 samples/android/color-blob-detection/AndroidManifest.xml    | 6 +++++-
 samples/android/face-detection/AndroidManifest.xml          | 6 +++++-
 .../src/org/opencv/samples/facedetect/FdActivity.java       | 2 --
 samples/android/image-manipulations/AndroidManifest.xml     | 6 +++++-
 .../imagemanipulations/ImageManipulationsActivity.java      | 2 --
 samples/android/tutorial-1-addopencv/AndroidManifest.xml    | 6 +++++-
 .../src/org/opencv/samples/tutorial1/Sample1Java.java       | 2 --
 samples/android/tutorial-2-opencvcamera/AndroidManifest.xml | 6 +++++-
 .../org/opencv/samples/tutorial2/Sample2NativeCamera.java   | 2 --
 samples/android/tutorial-3-native/AndroidManifest.xml       | 6 +++++-
 .../src/org/opencv/samples/tutorial3/Sample3Native.java     | 2 --
 samples/android/tutorial-4-mixed/AndroidManifest.xml        | 6 +++++-
 .../src/org/opencv/samples/tutorial4/Sample4Mixed.java      | 2 --
 15 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/samples/android/15-puzzle/AndroidManifest.xml b/samples/android/15-puzzle/AndroidManifest.xml
index 184d3d761e..356382bf14 100644
--- a/samples/android/15-puzzle/AndroidManifest.xml
+++ b/samples/android/15-puzzle/AndroidManifest.xml
@@ -7,7 +7,8 @@
 
     <application
         android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
 
         <activity
             android:name=".Puzzle15Activity"
diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
index a74b0b4d73..d1961964fd 100644
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
+++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java
@@ -13,8 +13,8 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
-import android.view.Window;
 import android.view.View;
+import android.view.WindowManager;
 
 public class Puzzle15Activity extends Activity implements CvCameraViewListener, View.OnTouchListener {
 
@@ -50,7 +50,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener,
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         setContentView(R.layout.activity_puzzle15);
 
diff --git a/samples/android/color-blob-detection/AndroidManifest.xml b/samples/android/color-blob-detection/AndroidManifest.xml
index 567e5648a5..9d04092821 100644
--- a/samples/android/color-blob-detection/AndroidManifest.xml
+++ b/samples/android/color-blob-detection/AndroidManifest.xml
@@ -4,7 +4,11 @@
           android:versionCode="21"
           android:versionName="2.1">
 
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
         <activity android:name="ColorBlobDetectionActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
diff --git a/samples/android/face-detection/AndroidManifest.xml b/samples/android/face-detection/AndroidManifest.xml
index a52dc660eb..bcbb34de3d 100644
--- a/samples/android/face-detection/AndroidManifest.xml
+++ b/samples/android/face-detection/AndroidManifest.xml
@@ -4,7 +4,11 @@
           android:versionCode="21"
           android:versionName="2.1">
 
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
         <activity android:name="FdActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
diff --git a/samples/android/face-detection/src/org/opencv/samples/facedetect/FdActivity.java b/samples/android/face-detection/src/org/opencv/samples/facedetect/FdActivity.java
index 2b949629cc..d59de02609 100644
--- a/samples/android/face-detection/src/org/opencv/samples/facedetect/FdActivity.java
+++ b/samples/android/face-detection/src/org/opencv/samples/facedetect/FdActivity.java
@@ -25,7 +25,6 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.Window;
 import android.view.WindowManager;
 
 public class FdActivity extends Activity implements CvCameraViewListener {
@@ -120,7 +119,6 @@ public class FdActivity extends Activity implements CvCameraViewListener {
     public void onCreate(Bundle savedInstanceState) {
         Log.i(TAG, "called onCreate");
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         setContentView(R.layout.face_detect_surface_view);
diff --git a/samples/android/image-manipulations/AndroidManifest.xml b/samples/android/image-manipulations/AndroidManifest.xml
index b83f799fe0..50ef788ac6 100644
--- a/samples/android/image-manipulations/AndroidManifest.xml
+++ b/samples/android/image-manipulations/AndroidManifest.xml
@@ -4,7 +4,11 @@
           android:versionCode="21"
           android:versionName="2.1">
 
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
         <activity android:name="ImageManipulationsActivity"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
index 26f7e8317d..a66145c92a 100644
--- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
+++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
@@ -22,7 +22,6 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.Window;
 import android.view.WindowManager;
 
 public class ImageManipulationsActivity extends Activity implements CvCameraViewListener {
@@ -101,7 +100,6 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
     public void onCreate(Bundle savedInstanceState) {
         Log.i(TAG, "called onCreate");
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         setContentView(R.layout.image_manipulations_surface_view);
diff --git a/samples/android/tutorial-1-addopencv/AndroidManifest.xml b/samples/android/tutorial-1-addopencv/AndroidManifest.xml
index 5ec908429a..9b4e797dab 100644
--- a/samples/android/tutorial-1-addopencv/AndroidManifest.xml
+++ b/samples/android/tutorial-1-addopencv/AndroidManifest.xml
@@ -4,7 +4,11 @@
           android:versionCode="21"
           android:versionName="2.1">
 
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
         <activity android:name="Sample1Java"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
index 6478f3bb05..9e5150f6cb 100644
--- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
+++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
@@ -13,7 +13,6 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SurfaceView;
-import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Toast;
 
@@ -50,7 +49,6 @@ public class Sample1Java extends Activity implements CvCameraViewListener {
     public void onCreate(Bundle savedInstanceState) {
         Log.i(TAG, "called onCreate");
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         setContentView(R.layout.tutorial1_surface_view);
diff --git a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
index 71e9c99857..3378b40e67 100644
--- a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
+++ b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
@@ -4,7 +4,11 @@
           android:versionCode="21"
           android:versionName="2.1">
 
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
         <activity android:name="Sample2NativeCamera"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
index dcdffe325d..009d00a8e3 100644
--- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
+++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
@@ -18,7 +18,6 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.Window;
 import android.view.WindowManager;
 
 public class Sample2NativeCamera extends Activity implements CvCameraViewListener {
@@ -63,7 +62,6 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene
     public void onCreate(Bundle savedInstanceState) {
         Log.i(TAG, "called onCreate");
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         setContentView(R.layout.tutorial2_surface_view);
diff --git a/samples/android/tutorial-3-native/AndroidManifest.xml b/samples/android/tutorial-3-native/AndroidManifest.xml
index b8cd0488e3..770474527c 100644
--- a/samples/android/tutorial-3-native/AndroidManifest.xml
+++ b/samples/android/tutorial-3-native/AndroidManifest.xml
@@ -4,7 +4,11 @@
           android:versionCode="21"
           android:versionName="2.1">
 
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
         <activity android:name="Sample3Native"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
index 5f0e6c8801..ea7998edc4 100644
--- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
+++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
@@ -12,7 +12,6 @@ import org.opencv.imgproc.Imgproc;
 import android.app.Activity;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Window;
 import android.view.WindowManager;
 
 public class Sample3Native extends Activity implements CvCameraViewListener {
@@ -52,7 +51,6 @@ public class Sample3Native extends Activity implements CvCameraViewListener {
     public void onCreate(Bundle savedInstanceState) {
         Log.i(TAG, "called onCreate");
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         setContentView(R.layout.tutorial3_surface_view);
diff --git a/samples/android/tutorial-4-mixed/AndroidManifest.xml b/samples/android/tutorial-4-mixed/AndroidManifest.xml
index 51460d34b3..22266fb765 100644
--- a/samples/android/tutorial-4-mixed/AndroidManifest.xml
+++ b/samples/android/tutorial-4-mixed/AndroidManifest.xml
@@ -4,7 +4,11 @@
           android:versionCode="21"
           android:versionName="2.1">
 
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
+    <application
+        android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+
         <activity android:name="Sample4Mixed"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
index e70f9d68c7..a1b455b680 100644
--- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
+++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
@@ -15,7 +15,6 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.Window;
 import android.view.WindowManager;
 
 public class Sample4Mixed extends Activity implements CvCameraViewListener {
@@ -68,7 +67,6 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener {
     public void onCreate(Bundle savedInstanceState) {
         Log.i(TAG, "called onCreate");
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         setContentView(R.layout.tutorial4_surface_view);