diff --git a/android/package/CMakeLists.txt b/android/package/CMakeLists.txt
index 191e61da6..4fe072869 100644
--- a/android/package/CMakeLists.txt
+++ b/android/package/CMakeLists.txt
@@ -89,5 +89,6 @@ add_custom_command(
DEPENDS "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper" "${PACKAGE_DIR}/res/values/strings.xml" "${PACKAGE_DIR}/res/drawable/icon.png" ${camera_wrappers} opencv_java
)
+install(FILES "${APK_NAME}" DESTINATION "apk/" COMPONENT main)
add_custom_target(android_package ALL SOURCES "${APK_NAME}" )
add_dependencies(android_package opencv_java)
\ No newline at end of file
diff --git a/android/package/res/drawable/icon.png b/android/package/res/drawable/icon.png
index 4e828bafd..630454927 100644
Binary files a/android/package/res/drawable/icon.png and b/android/package/res/drawable/icon.png differ
diff --git a/android/package/res/values/strings.xml b/android/package/res/values/strings.xml
index c8f59be46..2d58013d8 100644
--- a/android/package/res/values/strings.xml
+++ b/android/package/res/values/strings.xml
@@ -1,6 +1,6 @@
- OCV @OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@ binary pack for @ANDROID_PACKAGE_PLATFORM_NAME@
+ OCV @OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@ pack @ANDROID_PACKAGE_PLATFORM_NAME@
\ No newline at end of file
diff --git a/android/service/doc/AsyncServiceHelper.rst b/android/service/doc/AsyncServiceHelper.rst
deleted file mode 100644
index b63ba424b..000000000
--- a/android/service/doc/AsyncServiceHelper.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-*******************************************
-Java Asynchronious OpenCV Helper (internal)
-*******************************************
-
-.. highlight:: java
-.. module:: org.opencv.android
- :platform: Android
- :synopsis: Implements Android dependent Java classes
-.. Class:: AsyncServiceHelper
-
-Helper class provides implementation of asynchronious OpenCV initialization with Android OpenCV Engine Service.
-
-.. note:: This is imternal class. Does not use it directly. Use OpenCVLoader.initAsync() instead!
-
-int initOpenCV()
-----------------
-
-.. method:: int initOpenCV(String Version, Context AppContext, LoaderCallbackInterface Callback)
-
- Tries to init OpenCV library using OpenCV Engine Service. Callback method will be called, when initialisation finishes
-
- :param Version: Version of OpenCV
- :param AppContext: Application context for service connection
- :param CallBack: Object that implements LoaderCallbackInterface. See Helper callback interface
- :rtype: boolean
- :return: Return true if initialization starts successfully
\ No newline at end of file
diff --git a/android/service/doc/IOpenCVEngine.rst b/android/service/doc/IOpenCVEngine.rst
deleted file mode 100644
index 638095832..000000000
--- a/android/service/doc/IOpenCVEngine.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-***************************************
-Native OpenCV Manager service interface
-***************************************
-
-.. highlight:: cpp
-.. module:: IOpenCVEngine.h
- :platform: Android
- :synopsis: Defines OpenCV Manager interface for Android Binder component
-.. Class:: OpenCVEngine
-
-OpenCVEngine class provides Binder interface to OpenCV Manager Service
-
-int getEngineVersion()
-----------------------
-
-.. method:: int GetEngineVersion()
-
- Gets OpenCV Manager version
-
- :rtype: int
- :return: Returns OpenCV Manager version
-
-android::String16 getLibPathByVersion()
----------------------------------------
-
-.. method:: android::String16 GetLibPathByVersion(android::String16 version)
-
- Gets path to native OpenCV libraries
-
- :param version: OpenCV Library version
- :rtype: String;
- :return: Returns path to OpenCV native libs or empty string if OpenCV was not found
-
-android::String16 getLibraryList()
-----------------------------------
-
-.. method:: android::String16 GetLibraryList(android::String16 version)
-
- Gets list of OpenCV native libraries in loading order
-
- :param version: OpenCV Library version
- :rtype: String;
- :return: Returns OpenCV libraries names separated by semicolon symbol in loading order
-
-boolean installVersion()
-------------------------
-
-.. method:: boolean InstallVersion(android::String16 version)
-
- Trys to install defined version of OpenCV
-
- :param version: OpenCV Library version
- :rtype: String
- :return: Returns true if installation successful or package has been already installed
diff --git a/android/service/doc/Intro.rst b/android/service/doc/Intro.rst
index 650f26d4c..509fea76a 100644
--- a/android/service/doc/Intro.rst
+++ b/android/service/doc/Intro.rst
@@ -1,3 +1,6 @@
+
+.. _Android_OpenCV_Manager_Intro:
+
************
Introduction
************
diff --git a/android/service/doc/JavaHelper.rst b/android/service/doc/JavaHelper.rst
index 5304f02f6..41e07ef6b 100644
--- a/android/service/doc/JavaHelper.rst
+++ b/android/service/doc/JavaHelper.rst
@@ -38,10 +38,6 @@ boolean initAsync()
OpenCV version constants
-------------------------
-.. data:: OPENCV_VERSION_2_4_0
-
- OpenCV Library version 2.4.0
-
.. data:: OPENCV_VERSION_2_4_2
OpenCV Library version 2.4.2
diff --git a/android/service/doc/NativeHelper.rst b/android/service/doc/NativeHelper.rst
deleted file mode 100644
index c4ac69eef..000000000
--- a/android/service/doc/NativeHelper.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-********************
-Native OpenCV Helper
-********************
-
-.. highlight:: cpp
\ No newline at end of file
diff --git a/android/service/doc/OpenCVEngineInterface.rst b/android/service/doc/OpenCVEngineInterface.rst
deleted file mode 100644
index 05d316bd7..000000000
--- a/android/service/doc/OpenCVEngineInterface.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-*********************************
-Java OpenCV OpenCVEngineInterface
-*********************************
-
-.. highlight:: java
-.. module:: org.opencv.engine
- :platform: Android
- :synopsis: Defines OpenCV Manager interface for Android.
-.. Class:: OpenCVEngineInterface
-
-OpenCVEngineInterface class provides Java interface to OpenCV Manager Service. Is synchronous with native OpenCVEngine class
-
-.. note:: Do not use this class directly. Use OpenCVLoader instead!
-
-int getEngineVersion()
-----------------------
-
-.. method:: int GetEngineVersion()
-
- Get OpenCV Manager version
-
- :rtype: int
- :return: Return OpenCV Manager version
-
-String getLibPathByVersion()
-----------------------------
-
-.. method:: String GetLibPathByVersion(String version)
-
- Find already installed OpenCV library
-
- :param version: OpenCV library version
- :rtype: String
- :return: Return path to OpenCV native libs or empty string if OpenCV was not found
-
-String getLibraryList()
------------------------
-
-.. method:: String GetLibraryList(String version)
-
- Get list of OpenCV native libraries in loading order separated by ";" symbol
-
- :param version: OpenCV library version
- :rtype: String
- :return: Return OpenCV libraries names separated by symbol ";" in loading order
-
-boolean installVersion()
-------------------------
-
-.. method:: boolean InstallVersion(String version)
-
- Try to install defined version of OpenCV from Google Play (Android Market).
-
- :param version: OpenCV library version
- :rtype: String
- :return: Return true if installation was successful or OpenCV package has been already installed
-
\ No newline at end of file
diff --git a/android/service/doc/StaticHelper.rst b/android/service/doc/StaticHelper.rst
deleted file mode 100644
index 5cf4b283d..000000000
--- a/android/service/doc/StaticHelper.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-************************************
-Java Static OpenCV Helper (internal)
-************************************
-
-.. highlight:: java
-.. module:: org.opencv.android
- :platform: Android
- :synopsis: Implements Android dependent Java classes
-.. Class:: StaticHelper
-
-Helper class provides implementation of static OpenCV initialization. All OpenCV libraries must be included to application package.
-
-.. note:: This is internal class. Does not use it directly. Use OpenCVLoader.initDebug() instead!
-
-int initOpenCV()
-----------------
-
-.. method:: int initOpenCV()
-
- Tries to init OpenCV library using libraries from application package. Method uses libopencv_info.so library for getting
- list of libraries in loading order. Method loads libopencv_java.so, if info library is not present.
-
- :rtype: boolean
- :return: Return true if initialization was successful
\ No newline at end of file
diff --git a/android/service/doc/index.rst b/android/service/doc/index.rst
index 00567568c..57a250a83 100644
--- a/android/service/doc/index.rst
+++ b/android/service/doc/index.rst
@@ -1,3 +1,6 @@
+
+.. _Android_OpenCV_Manager:
+
***********************
Android OpenCV Manager
***********************
diff --git a/android/service/engine/AndroidManifest.xml b/android/service/engine/AndroidManifest.xml
index cb48a9ef4..7567dd31e 100644
--- a/android/service/engine/AndroidManifest.xml
+++ b/android/service/engine/AndroidManifest.xml
@@ -1,10 +1,11 @@
+ android:versionCode="11"
+ android:versionName="1.1" >
+
-
+
\ No newline at end of file
diff --git a/android/service/engine/res/drawable/icon.png b/android/service/engine/res/drawable/icon.png
index 4e828bafd..630454927 100644
Binary files a/android/service/engine/res/drawable/icon.png and b/android/service/engine/res/drawable/icon.png differ
diff --git a/android/service/engine/res/layout/main.xml b/android/service/engine/res/layout/main.xml
index 463685487..c02e0e2e5 100644
--- a/android/service/engine/res/layout/main.xml
+++ b/android/service/engine/res/layout/main.xml
@@ -8,14 +8,14 @@
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="About:"
+ android:text="About"
android:textAppearance="?android:attr/textAppearanceLarge" />
+ android:text="Check for update" />
\ No newline at end of file
diff --git a/doc/opencv2refman.pdf b/doc/opencv2refman.pdf
index e5990faaf..3181338be 100644
--- a/doc/opencv2refman.pdf
+++ b/doc/opencv2refman.pdf
@@ -517,82 +517,100 @@ endobj
(contrib. Contributed/Experimental Stuff)
endobj
345 0 obj
-<< /S /GoTo /D (chapter.16) >>
+<< /S /GoTo /D (section.15.1) >>
endobj
348 0 obj
-(legacy. Deprecated stuff)
+(Stereo Correspondence)
endobj
349 0 obj
-<< /S /GoTo /D (section.16.1) >>
+<< /S /GoTo /D (section.15.2) >>
endobj
352 0 obj
-(Motion Analysis)
+(FaceRecognizer - Face Recognition with OpenCV)
endobj
353 0 obj
-<< /S /GoTo /D (section.16.2) >>
+<< /S /GoTo /D (chapter.16) >>
endobj
356 0 obj
-(Expectation Maximization)
+(legacy. Deprecated stuff)
endobj
357 0 obj
-<< /S /GoTo /D (section.16.3) >>
+<< /S /GoTo /D (section.16.1) >>
endobj
360 0 obj
-(Planar Subdivisions \(C API\))
+(Motion Analysis)
endobj
361 0 obj
-<< /S /GoTo /D (section.16.4) >>
+<< /S /GoTo /D (section.16.2) >>
endobj
364 0 obj
-(Feature Detection and Description)
+(Expectation Maximization)
endobj
365 0 obj
-<< /S /GoTo /D (section.16.5) >>
+<< /S /GoTo /D (section.16.3) >>
endobj
368 0 obj
-(Common Interfaces of Descriptor Extractors)
+(Histograms)
endobj
369 0 obj
-<< /S /GoTo /D (section.16.6) >>
+<< /S /GoTo /D (section.16.4) >>
endobj
372 0 obj
-(Common Interfaces of Generic Descriptor Matchers)
+(Planar Subdivisions \(C API\))
endobj
373 0 obj
-<< /S /GoTo /D (chapter*.3831) >>
+<< /S /GoTo /D (section.16.5) >>
endobj
376 0 obj
-(Bibliography)
+(Feature Detection and Description)
endobj
377 0 obj
-<< /S /GoTo /D [378 0 R /Fit ] >>
+<< /S /GoTo /D (section.16.6) >>
endobj
-380 0 obj <<
-/Length 254
+380 0 obj
+(Common Interfaces of Descriptor Extractors)
+endobj
+381 0 obj
+<< /S /GoTo /D (section.16.7) >>
+endobj
+384 0 obj
+(Common Interfaces of Generic Descriptor Matchers)
+endobj
+385 0 obj
+<< /S /GoTo /D (chapter*.3944) >>
+endobj
+388 0 obj
+(Bibliography)
+endobj
+389 0 obj
+<< /S /GoTo /D [390 0 R /Fit ] >>
+endobj
+392 0 obj <<
+/Length 255
/Filter /FlateDecode
>>
stream
-xڽON0+|l%jl7i# @#2Pm@t(B>1w$vl@pk(G֗PB;?1۷jEIbIL۶l4hN{~~_Fs~Ģ!n-4ESY>
WO|6%S4rGח8SZىZ\cPyS)#-0cT"=TfWBYNe":/-n
+xڽOj0+tL`Qeَ6RzAӰuulmɒ{{ S@g9T9(B=緽0۷jF[QjMJ#u]4s[V{xR=bHZ:+!@{Fo,%#ka,ļ`_eqX>yw,InKסj#|BHͮF-c%'6{OpFډ8AZrPX;7Cs)8G9a am
endstream
endobj
-378 0 obj <<
+390 0 obj <<
/Type /Page
-/Contents 380 0 R
-/Resources 379 0 R
+/Contents 392 0 R
+/Resources 391 0 R
/MediaBox [0 0 612 792]
-/Parent 386 0 R
+/Parent 398 0 R
>> endobj
-381 0 obj <<
-/D [378 0 R /XYZ 71 757.862 null]
+393 0 obj <<
+/D [390 0 R /XYZ 71 757.862 null]
>> endobj
-382 0 obj <<
-/D [378 0 R /XYZ 72 720 null]
+394 0 obj <<
+/D [390 0 R /XYZ 72 720 null]
>> endobj
-379 0 obj <<
-/Font << /F52 383 0 R /F53 384 0 R /F54 385 0 R >>
+391 0 obj <<
+/Font << /F52 395 0 R /F53 396 0 R /F54 397 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-389 0 obj <<
+401 0 obj <<
/Length 19
/Filter /FlateDecode
>>
@@ -600,754 +618,776 @@ stream
x3PHW0Pp2A c(
endstream
endobj
-388 0 obj <<
+400 0 obj <<
/Type /Page
-/Contents 389 0 R
-/Resources 387 0 R
+/Contents 401 0 R
+/Resources 399 0 R
/MediaBox [0 0 612 792]
-/Parent 386 0 R
+/Parent 398 0 R
>> endobj
-390 0 obj <<
-/D [388 0 R /XYZ 71 757.862 null]
+402 0 obj <<
+/D [400 0 R /XYZ 71 757.862 null]
>> endobj
-387 0 obj <<
+399 0 obj <<
/ProcSet [ /PDF ]
>> endobj
-428 0 obj <<
-/Length 1288
+440 0 obj <<
+/Length 1294
/Filter /FlateDecode
>>
stream
-x[[F).sdK7}6jܶnv k`bIFW@p:n288a`#0z`2|r|>vL>a 4w\:+ ŭC ͑:g\(p2tQ}PxPz)e
-9Ӧ O0fn3w(]D! {Tzϊ85ZoF
-16bRkRBt&]]V'E)pO `Co'UF,*SsbdG'Q|kqò\iur UXo8Wf따İ5L`:zZɏM`b5VKxT
`_dEyvIn{~` }ǃ_\+NJTYRWډ^C¯ASHкu>!k'q
-|":#٣.nFkye?ٮ4d=3#v"ChJ138=TȌ ΒpfyEf$bhLV9#e~lي 40G.U3,u(,y2{",~Ca|J50fD"h1#k<1@=tX'ݎJq#E*~S՝ӱ`o|L48-(oEۆ=G^[rቩN:~dFE_u)2QDx#5}<-c5\#^KNo{9CS^\tܙ#߀o*iTdR+\ዾM[m+N*~Rq\-R2D#g'd6m'ϥ_Žmϑf f2wL^Rnocă6B;H!cM|;T_XW25TTT; x%#OzSX@Bof`->&mTv-nuWÆIV`*
S
-z.aSQQ=p[Ph($YhֆH)>GiDZDQhKrD/ f#f y%j>#?> aݒ8̣{6kx2})pn}dp#X)\>5
JXVO>
+xKwF,a!