diff --git a/doc/tutorials/dnn/dnn_android/dnn_android.markdown b/doc/tutorials/dnn/dnn_android/dnn_android.markdown index 158dac8b0c..0ceaebbe8f 100644 --- a/doc/tutorials/dnn/dnn_android/dnn_android.markdown +++ b/doc/tutorials/dnn/dnn_android/dnn_android.markdown @@ -88,7 +88,7 @@ into `app/build/intermediates/assets/debug` folder. - Modify `/app/src/main/AndroidManifest.xml` to enable full-screen mode, set up a correct screen orientation and allow to use a camera. -@include android/mobilenet-objdetect/AndroidManifest.xml +@include android/mobilenet-objdetect/gradle/AndroidManifest.xml - Replace content of `app/src/main/java/org/opencv/samples/opencv_mobilenet/MainActivity.java`: @include android/mobilenet-objdetect/src/org/opencv/samples/opencv_mobilenet/MainActivity.java diff --git a/samples/android/camera-calibration/AndroidManifest.xml b/samples/android/camera-calibration/AndroidManifest.xml deleted file mode 100644 index 20282a10db..0000000000 --- a/samples/android/camera-calibration/AndroidManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/color-blob-detection/AndroidManifest.xml b/samples/android/color-blob-detection/AndroidManifest.xml deleted file mode 100644 index ac16bb9931..0000000000 --- a/samples/android/color-blob-detection/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/face-detection/AndroidManifest.xml b/samples/android/face-detection/AndroidManifest.xml deleted file mode 100644 index f661567455..0000000000 --- a/samples/android/face-detection/AndroidManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/image-manipulations/AndroidManifest.xml b/samples/android/image-manipulations/AndroidManifest.xml deleted file mode 100644 index 7791b4287a..0000000000 --- a/samples/android/image-manipulations/AndroidManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/mobilenet-objdetect/AndroidManifest.xml b/samples/android/mobilenet-objdetect/AndroidManifest.xml deleted file mode 100644 index e8d17ba6a3..0000000000 --- a/samples/android/mobilenet-objdetect/AndroidManifest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-1-camerapreview/AndroidManifest.xml b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml deleted file mode 100644 index d9ecac8462..0000000000 --- a/samples/android/tutorial-1-camerapreview/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml deleted file mode 100644 index 0d44becdbe..0000000000 --- a/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml deleted file mode 100644 index 508ee94635..0000000000 --- a/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-4-opencl/AndroidManifest.xml b/samples/android/tutorial-4-opencl/AndroidManifest.xml deleted file mode 100644 index f44d9a5dcc..0000000000 --- a/samples/android/tutorial-4-opencl/AndroidManifest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - -