Unify manifest files in Android examples

diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
index 16dbb06..f65e27f 100644 (file)
--- a/cmake/OpenCVPCHSupport.cmake
+++ b/cmake/OpenCVPCHSupport.cmake
@@ -113,6 +113,7 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
             SET(${out_command}
               ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
               )
+            message("!!!!!!!!!!!!!!!!${${out_command}}!!!!")
         ELSE(CMAKE_CXX_COMPILER_ARG1)
             SET(${out_command}
               ${CMAKE_CXX_COMPILER}  ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}

diff --git a/samples/android/15-puzzle/AndroidManifest.xml b/samples/android/15-puzzle/AndroidManifest.xml
index 02a6cc9..5c60b62 100644 (file)
--- a/samples/android/15-puzzle/AndroidManifest.xml
+++ b/samples/android/15-puzzle/AndroidManifest.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.puzzle15"
-      android:versionCode="21"
-      android:versionName="2.1">
+          package="org.opencv.samples.puzzle15"
+          android:versionCode="21"
+          android:versionName="2.1">
 
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:anyDensity="true" />
-
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name=".puzzle15Activity"
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name="puzzle15Activity"
                   android:label="@string/app_name"
                   android:screenOrientation="landscape"
                   android:configChanges="keyboardHidden|orientation">
@@ -22,9 +16,19 @@
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
     <uses-sdk android:minSdkVersion="8" />
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
+
 </manifest>
\ No newline at end of file

diff --git a/samples/android/color-blob-detection/AndroidManifest.xml b/samples/android/color-blob-detection/AndroidManifest.xml
index a580be6..f8bf493 100644 (file)
--- a/samples/android/color-blob-detection/AndroidManifest.xml
+++ b/samples/android/color-blob-detection/AndroidManifest.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.opencv.example.colorblobdetect"
-    android:versionCode="21"
-    android:versionName="2.1" >
+          package="org.opencv.example.colorblobdetect"
+          android:versionCode="21"
+          android:versionName="2.1" >
 
-    <uses-sdk android:minSdkVersion="8" />
-
-    <application
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
-        <activity
-            android:name="org.opencv.samples.colorblobdetect.ColorBlobDetectionActivity"
-            android:label="@string/app_name" >
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name="ColorBlobDetectionActivity"
+                  android:label="@string/app_name"
+                  android:screenOrientation="landscape"
+                  android:configChanges="keyboardHidden|orientation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
+    <uses-sdk android:minSdkVersion="8" />
+
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
 </manifest>
\ No newline at end of file

diff --git a/samples/android/face-detection/AndroidManifest.xml b/samples/android/face-detection/AndroidManifest.xml
index 285bcb9..eaa90df 100644 (file)
--- a/samples/android/face-detection/AndroidManifest.xml
+++ b/samples/android/face-detection/AndroidManifest.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.fd"
-      android:versionCode="21"
-      android:versionName="2.1">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:anyDensity="true" />
+          package="org.opencv.samples.fd"
+          android:versionCode="21"
+          android:versionName="2.1">
 
     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="FdActivity"
@@ -22,10 +16,19 @@
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
     <uses-sdk android:minSdkVersion="8" />
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
 </manifest>

diff --git a/samples/android/image-manipulations/AndroidManifest.xml b/samples/android/image-manipulations/AndroidManifest.xml
index 72df75e..b83f799 100644 (file)
--- a/samples/android/image-manipulations/AndroidManifest.xml
+++ b/samples/android/image-manipulations/AndroidManifest.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.imagemanipulations"
-      android:versionCode="21"
-      android:versionName="2.1">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:anyDensity="true" />
+          package="org.opencv.samples.imagemanipulations"
+          android:versionCode="21"
+          android:versionName="2.1">
 
     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="ImageManipulationsActivity"
@@ -22,10 +16,19 @@
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
     <uses-sdk android:minSdkVersion="8" />
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
 </manifest>

diff --git a/samples/android/tutorial-0-androidcamera/AndroidManifest.xml b/samples/android/tutorial-0-androidcamera/AndroidManifest.xml
index 714b009..d703810 100644 (file)
--- a/samples/android/tutorial-0-androidcamera/AndroidManifest.xml
+++ b/samples/android/tutorial-0-androidcamera/AndroidManifest.xml
@@ -1,20 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.tutorial0"
-      android:versionCode="21"
-      android:versionName="2.1">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:anyDensity="true" />
-
-    <uses-sdk android:minSdkVersion="8"/>
-
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+          package="org.opencv.samples.tutorial0"
+          android:versionCode="21"
+          android:versionName="2.1">
 
     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="Sample0Base"
@@ -28,5 +16,19 @@
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
+    <uses-sdk android:minSdkVersion="8" />
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
 </manifest>

diff --git a/samples/android/tutorial-1-addopencv/AndroidManifest.xml b/samples/android/tutorial-1-addopencv/AndroidManifest.xml
index 51cc50f..5ec9084 100644 (file)
--- a/samples/android/tutorial-1-addopencv/AndroidManifest.xml
+++ b/samples/android/tutorial-1-addopencv/AndroidManifest.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.tutorial1"
-      android:versionCode="21"
-      android:versionName="2.1">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:anyDensity="true" />
+          package="org.opencv.samples.tutorial1"
+          android:versionCode="21"
+          android:versionName="2.1">
 
     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="Sample1Java"
@@ -22,10 +16,19 @@
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
     <uses-sdk android:minSdkVersion="8" />
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
 </manifest>

diff --git a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
index 7daacd1..71e9c99 100644 (file)
--- a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
+++ b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.tutorial2"
-      android:versionCode="21"
-      android:versionName="2.1">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:anyDensity="true" />
+          package="org.opencv.samples.tutorial2"
+          android:versionCode="21"
+          android:versionName="2.1">
 
     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="Sample2NativeCamera"
@@ -22,10 +16,19 @@
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
     <uses-sdk android:minSdkVersion="8" />
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
 </manifest>

diff --git a/samples/android/tutorial-3-native/AndroidManifest.xml b/samples/android/tutorial-3-native/AndroidManifest.xml
index 8ee3814..b8cd048 100644 (file)
--- a/samples/android/tutorial-3-native/AndroidManifest.xml
+++ b/samples/android/tutorial-3-native/AndroidManifest.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.tutorial3"
-      android:versionCode="21"
-      android:versionName="2.1">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:anyDensity="true" />
+          package="org.opencv.samples.tutorial3"
+          android:versionCode="21"
+          android:versionName="2.1">
 
     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="Sample3Native"
@@ -22,10 +16,19 @@
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
     <uses-sdk android:minSdkVersion="8" />
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
 </manifest>

diff --git a/samples/android/tutorial-4-mixed/AndroidManifest.xml b/samples/android/tutorial-4-mixed/AndroidManifest.xml
index 524c763..51460d3 100644 (file)
--- a/samples/android/tutorial-4-mixed/AndroidManifest.xml
+++ b/samples/android/tutorial-4-mixed/AndroidManifest.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv.samples.tutorial4"
-      android:versionCode="21"
-      android:versionName="2.1">
-
-    <supports-screens android:resizeable="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:anyDensity="true" />
+          package="org.opencv.samples.tutorial4"
+          android:versionCode="21"
+          android:versionName="2.1">
 
     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="Sample4Mixed"
@@ -22,10 +16,19 @@
         </activity>
     </application>
 
+    <supports-screens android:resizeable="true"
+                      android:smallScreens="true"
+                      android:normalScreens="true"
+                      android:largeScreens="true"
+                      android:anyDensity="true" />
+
     <uses-sdk android:minSdkVersion="8" />
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
 </manifest>