Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unify manifest files in Android examples

Browse Source 
(cherry picked from commit bd12f636c8)

Signed-off-by: Andrey Kamaev <andrey.kamaev@itseez.com>
pull/39/head
Andrey Kamaev 13 years ago
parent ca0609dde3
commit 11bffb0e7d
10 changed files with 140 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      cmake/OpenCVPCHSupport.cmake
  2. 24
      samples/android/15-puzzle/AndroidManifest.xml
  3. 29
      samples/android/color-blob-detection/AndroidManifest.xml
  4. 19
      samples/android/face-detection/AndroidManifest.xml
  5. 19
      samples/android/image-manipulations/AndroidManifest.xml
  6. 26
      samples/android/tutorial-0-androidcamera/AndroidManifest.xml
  7. 19
      samples/android/tutorial-1-addopencv/AndroidManifest.xml
  8. 19
      samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
  9. 19
      samples/android/tutorial-3-native/AndroidManifest.xml
  10. 19
      samples/android/tutorial-4-mixed/AndroidManifest.xml

1
cmake/OpenCVPCHSupport.cmake
Unescape View File

@ -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}

24
samples/android/15-puzzle/AndroidManifest.xml
Unescape View File

@ -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 @@
</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>

29
samples/android/color-blob-detection/AndroidManifest.xml
Unescape View File

@ -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>

19
samples/android/face-detection/AndroidManifest.xml
Unescape View File

@ -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 @@
</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>

19
samples/android/image-manipulations/AndroidManifest.xml
Unescape View File

@ -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 @@
</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>

26
samples/android/tutorial-0-androidcamera/AndroidManifest.xml
Unescape View File

@ -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 @@
</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>

19
samples/android/tutorial-1-addopencv/AndroidManifest.xml
Unescape View File

@ -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 @@
</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>

19
samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
Unescape View File

@ -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 @@
</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>

19
samples/android/tutorial-3-native/AndroidManifest.xml
Unescape View File

@ -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 @@
</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>

19
samples/android/tutorial-4-mixed/AndroidManifest.xml
Unescape View File

@ -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 @@
</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>

Write Preview
Loading…
Cancel
Save