From 3a1ccd5f43d7db1039825d962f3d9fa033dd91b4 Mon Sep 17 00:00:00 2001
From: Otto Seiskari <otto.seiskari@gmail.com>
Date: Sun, 17 Mar 2019 17:32:43 +0200
Subject: [PATCH] Remove fullscreen android:theme where it hides the menu

Many of the Android samples rely on an options menu to work properly
but, at least on newer devices, the menu is permanently hidden by the
Android theme "Theme.NoTitleBar.Fullscreen", which means that most
of the examples were dysfunctional.
---
 samples/android/15-puzzle/AndroidManifest.xml                  | 3 +--
 samples/android/15-puzzle/gradle/AndroidManifest.xml           | 3 +--
 samples/android/camera-calibration/AndroidManifest.xml         | 3 +--
 samples/android/camera-calibration/gradle/AndroidManifest.xml  | 3 +--
 samples/android/face-detection/AndroidManifest.xml             | 3 +--
 samples/android/face-detection/gradle/AndroidManifest.xml      | 3 +--
 samples/android/image-manipulations/AndroidManifest.xml        | 3 +--
 samples/android/image-manipulations/gradle/AndroidManifest.xml | 3 +--
 samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml | 3 +--
 .../tutorial-2-mixedprocessing/gradle/AndroidManifest.xml      | 3 +--
 samples/android/tutorial-3-cameracontrol/AndroidManifest.xml   | 3 +--
 .../tutorial-3-cameracontrol/gradle/AndroidManifest.xml        | 3 +--
 samples/android/tutorial-4-opencl/AndroidManifest.xml          | 3 +--
 samples/android/tutorial-4-opencl/gradle/AndroidManifest.xml   | 3 +--
 14 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/samples/android/15-puzzle/AndroidManifest.xml b/samples/android/15-puzzle/AndroidManifest.xml
index c783076a84..86bda2cff8 100644
--- a/samples/android/15-puzzle/AndroidManifest.xml
+++ b/samples/android/15-puzzle/AndroidManifest.xml
@@ -8,8 +8,7 @@
 
     <application
         android:icon="@drawable/icon"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:label="@string/app_name" >
 
         <activity
             android:name=".Puzzle15Activity"
diff --git a/samples/android/15-puzzle/gradle/AndroidManifest.xml b/samples/android/15-puzzle/gradle/AndroidManifest.xml
index c0c6cbbc8d..6d1d2b3bc5 100644
--- a/samples/android/15-puzzle/gradle/AndroidManifest.xml
+++ b/samples/android/15-puzzle/gradle/AndroidManifest.xml
@@ -5,8 +5,7 @@
 
     <application
         android:icon="@drawable/icon"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:label="@string/app_name">
 
         <activity
             android:name=".Puzzle15Activity"
diff --git a/samples/android/camera-calibration/AndroidManifest.xml b/samples/android/camera-calibration/AndroidManifest.xml
index 7c03ba0bee..20282a10db 100644
--- a/samples/android/camera-calibration/AndroidManifest.xml
+++ b/samples/android/camera-calibration/AndroidManifest.xml
@@ -6,8 +6,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+        android:icon="@drawable/icon">
 
         <activity android:name="CameraCalibrationActivity"
                   android:label="@string/app_name"
diff --git a/samples/android/camera-calibration/gradle/AndroidManifest.xml b/samples/android/camera-calibration/gradle/AndroidManifest.xml
index 11444ff48c..eaade4a7ba 100644
--- a/samples/android/camera-calibration/gradle/AndroidManifest.xml
+++ b/samples/android/camera-calibration/gradle/AndroidManifest.xml
@@ -5,8 +5,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+        android:icon="@drawable/icon">
 
         <activity android:name="CameraCalibrationActivity"
                   android:label="@string/app_name"
diff --git a/samples/android/face-detection/AndroidManifest.xml b/samples/android/face-detection/AndroidManifest.xml
index bdd1c6df63..f661567455 100644
--- a/samples/android/face-detection/AndroidManifest.xml
+++ b/samples/android/face-detection/AndroidManifest.xml
@@ -6,8 +6,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
 
         <activity android:name="FdActivity"
                   android:label="@string/app_name"
diff --git a/samples/android/face-detection/gradle/AndroidManifest.xml b/samples/android/face-detection/gradle/AndroidManifest.xml
index c9c69fd243..e3a46ac5a0 100644
--- a/samples/android/face-detection/gradle/AndroidManifest.xml
+++ b/samples/android/face-detection/gradle/AndroidManifest.xml
@@ -5,8 +5,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
 
         <activity android:name="FdActivity"
                   android:label="@string/app_name"
diff --git a/samples/android/image-manipulations/AndroidManifest.xml b/samples/android/image-manipulations/AndroidManifest.xml
index ff78f09035..7791b4287a 100644
--- a/samples/android/image-manipulations/AndroidManifest.xml
+++ b/samples/android/image-manipulations/AndroidManifest.xml
@@ -6,8 +6,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
 
         <activity android:name="ImageManipulationsActivity"
                   android:label="@string/app_name"
diff --git a/samples/android/image-manipulations/gradle/AndroidManifest.xml b/samples/android/image-manipulations/gradle/AndroidManifest.xml
index 5c3b71a77b..bc89d9615d 100644
--- a/samples/android/image-manipulations/gradle/AndroidManifest.xml
+++ b/samples/android/image-manipulations/gradle/AndroidManifest.xml
@@ -5,8 +5,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
 
         <activity android:name="ImageManipulationsActivity"
                   android:label="@string/app_name"
diff --git a/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml
index ce6beab401..0d44becdbe 100644
--- a/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml
+++ b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml
@@ -6,8 +6,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
 
         <activity android:name="Tutorial2Activity"
                   android:label="@string/app_name"
diff --git a/samples/android/tutorial-2-mixedprocessing/gradle/AndroidManifest.xml b/samples/android/tutorial-2-mixedprocessing/gradle/AndroidManifest.xml
index 34753e4daa..574facc3d5 100644
--- a/samples/android/tutorial-2-mixedprocessing/gradle/AndroidManifest.xml
+++ b/samples/android/tutorial-2-mixedprocessing/gradle/AndroidManifest.xml
@@ -5,8 +5,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
 
         <activity android:name="Tutorial2Activity"
                   android:label="@string/app_name"
diff --git a/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml
index e2854585d1..508ee94635 100644
--- a/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml
+++ b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml
@@ -6,8 +6,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
 
         <activity android:name="Tutorial3Activity"
                   android:label="@string/app_name"
diff --git a/samples/android/tutorial-3-cameracontrol/gradle/AndroidManifest.xml b/samples/android/tutorial-3-cameracontrol/gradle/AndroidManifest.xml
index 4985185b10..d8baa0859c 100644
--- a/samples/android/tutorial-3-cameracontrol/gradle/AndroidManifest.xml
+++ b/samples/android/tutorial-3-cameracontrol/gradle/AndroidManifest.xml
@@ -5,8 +5,7 @@
 
     <application
         android:label="@string/app_name"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
 
         <activity android:name="Tutorial3Activity"
                   android:label="@string/app_name"
diff --git a/samples/android/tutorial-4-opencl/AndroidManifest.xml b/samples/android/tutorial-4-opencl/AndroidManifest.xml
index 6bce3c7191..f44d9a5dcc 100644
--- a/samples/android/tutorial-4-opencl/AndroidManifest.xml
+++ b/samples/android/tutorial-4-opencl/AndroidManifest.xml
@@ -15,8 +15,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
         <activity
             android:name=".Tutorial4Activity"
             android:label="@string/app_name"
diff --git a/samples/android/tutorial-4-opencl/gradle/AndroidManifest.xml b/samples/android/tutorial-4-opencl/gradle/AndroidManifest.xml
index 6bce3c7191..f44d9a5dcc 100644
--- a/samples/android/tutorial-4-opencl/gradle/AndroidManifest.xml
+++ b/samples/android/tutorial-4-opencl/gradle/AndroidManifest.xml
@@ -15,8 +15,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/icon"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+        android:icon="@drawable/icon">
         <activity
             android:name=".Tutorial4Activity"
             android:label="@string/app_name"