Skip to content

O
opencv
Commit 11bffb0e authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Unify manifest files in Android examples 

(cherry picked from commit bd12f636)
Signed-off-by: 's avatarAndrey Kamaev <andrey.kamaev@itseez.com>
parent ca0609dd
Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 81 deletions
cmake/OpenCVPCHSupport.cmake
View file @ 11bffb0e
...@@ -113,6 +113,7 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output) ...@@ -113,6 +113,7 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
SET(${out_command} SET(${out_command}
${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
) )
message("!!!!!!!!!!!!!!!!${${out_command}}!!!!")
ELSE(CMAKE_CXX_COMPILER_ARG1) ELSE(CMAKE_CXX_COMPILER_ARG1)
SET(${out_command} SET(${out_command}
${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
......
samples/android/15-puzzle/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,14 +4,8 @@ ...@@ -4,14 +4,8 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1"> android:versionName="2.1">
<supports-screens android:resizeable="true" <application android:label="@string/app_name" android:icon="@drawable/icon">
android:smallScreens="true" <activity android:name="puzzle15Activity"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".puzzle15Activity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation"> android:configChanges="keyboardHidden|orientation">
...@@ -22,9 +16,19 @@ ...@@ -22,9 +16,19 @@
</activity> </activity>
</application> </application>
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-permission android:name="android.permission.CAMERA"/> <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> </manifest>
\ No newline at end of file
samples/android/color-blob-detection/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,24 +4,31 @@ ...@@ -4,24 +4,31 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1" > android:versionName="2.1" >
<uses-sdk android:minSdkVersion="8" /> <application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="ColorBlobDetectionActivity"
<application android:label="@string/app_name"
android:icon="@drawable/icon" android:screenOrientation="landscape"
android:label="@string/app_name" > android:configChanges="keyboardHidden|orientation">
<activity
android:name="org.opencv.samples.colorblobdetect.ColorBlobDetectionActivity"
android:label="@string/app_name" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
</application> </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-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> </manifest>
\ No newline at end of file
samples/android/face-detection/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1"> android:versionName="2.1">
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<application android:label="@string/app_name" android:icon="@drawable/icon"> <application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="FdActivity" <activity android:name="FdActivity"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -22,10 +16,19 @@ ...@@ -22,10 +16,19 @@
</activity> </activity>
</application> </application>
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-permission android:name="android.permission.CAMERA"/> <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> </manifest>
samples/android/image-manipulations/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1"> android:versionName="2.1">
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<application android:label="@string/app_name" android:icon="@drawable/icon"> <application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="ImageManipulationsActivity" <activity android:name="ImageManipulationsActivity"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -22,10 +16,19 @@ ...@@ -22,10 +16,19 @@
</activity> </activity>
</application> </application>
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-permission android:name="android.permission.CAMERA"/> <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> </manifest>
samples/android/tutorial-0-androidcamera/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,18 +4,6 @@ ...@@ -4,18 +4,6 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1"> 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" />
<application android:label="@string/app_name" android:icon="@drawable/icon"> <application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="Sample0Base" <activity android:name="Sample0Base"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -28,5 +16,19 @@ ...@@ -28,5 +16,19 @@
</activity> </activity>
</application> </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> </manifest>
samples/android/tutorial-1-addopencv/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1"> android:versionName="2.1">
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<application android:label="@string/app_name" android:icon="@drawable/icon"> <application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="Sample1Java" <activity android:name="Sample1Java"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -22,10 +16,19 @@ ...@@ -22,10 +16,19 @@
</activity> </activity>
</application> </application>
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-permission android:name="android.permission.CAMERA"/> <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> </manifest>
samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1"> android:versionName="2.1">
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<application android:label="@string/app_name" android:icon="@drawable/icon"> <application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="Sample2NativeCamera" <activity android:name="Sample2NativeCamera"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -22,10 +16,19 @@ ...@@ -22,10 +16,19 @@
</activity> </activity>
</application> </application>
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-permission android:name="android.permission.CAMERA"/> <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> </manifest>
samples/android/tutorial-3-native/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1"> android:versionName="2.1">
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<application android:label="@string/app_name" android:icon="@drawable/icon"> <application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="Sample3Native" <activity android:name="Sample3Native"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -22,10 +16,19 @@ ...@@ -22,10 +16,19 @@
</activity> </activity>
</application> </application>
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-permission android:name="android.permission.CAMERA"/> <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> </manifest>
samples/android/tutorial-4-mixed/AndroidManifest.xml
View file @ 11bffb0e
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
android:versionCode="21" android:versionCode="21"
android:versionName="2.1"> android:versionName="2.1">
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<application android:label="@string/app_name" android:icon="@drawable/icon"> <application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="Sample4Mixed" <activity android:name="Sample4Mixed"
android:label="@string/app_name" android:label="@string/app_name"
...@@ -22,10 +16,19 @@ ...@@ -22,10 +16,19 @@
</activity> </activity>
</application> </application>
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:anyDensity="true" />
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" />
<uses-permission android:name="android.permission.CAMERA"/> <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> </manifest>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment