Updated readme.txt with desciption about different OCV Manager packages

diff --git a/android/service/doc/UseCases.rst b/android/service/doc/UseCases.rst
index ff26410e70afc1ac9d1eeb94ae1709170144198e..59d6215b8e10d19be1373f7326d4c2074901f51d 100644 (file)
--- a/android/service/doc/UseCases.rst
+++ b/android/service/doc/UseCases.rst
@@ -3,38 +3,7 @@ Manager Workflow
 
 .. _manager_selection:
 
-OpenCV Manager selection
-------------------------
-
-Since version 1.7 several packages of OpenCV Manager is built. Every package includes OpenCV library
-for package target platform. The internal library is used for most cases, except the rare one, when
-arm-v7a without NEON instruction set processor is detected. In this case additional binary package
-for arm-v7a is used. The new package selection logic in most cases simplifies OpenCV installation
-on end user devices. In most cases OpenCV Manager may be installed automatically from Google Play.
-For such case, when Google Play is not available, i.e. emulator, developer board, etc, you can
-install it manually using adb tool.
-
-.. code-block:: sh
-    :linenos:
-
-    adb install OpenCV-2.4.3-android-sdk/apk/OpenCV_2.4.3_Manager_2.0_<platform_name>.apk
-
-Use table to determine right OpenCV Manager package:
-
-+----------------------------+-----------------+-----------------------------------------------------+
-| Hardware Platform          | Android version | Package name                                        |
-+============================+=================+=====================================================+
-| Intel x86                  | >= 2.3          | OpenCV_2.4.3_Manager_2.0_x86.apk                    |
-+----------------------------+-----------------+-----------------------------------------------------+
-| MIPS                       | >= 2.3          | OpenCV_2.4.3_Manager_2.0_mips.apk                   |
-+----------------------------+-----------------+-----------------------------------------------------+
-| armeabi (arm-v5, arm-v6)   | >= 2.3          | OpenCV_2.4.3_Manager_2.0_armeabi.apk                |
-+----------------------------+-----------------+-----------------------------------------------------+
-| armeabi-v7a (arm-v7a-NEON) | >= 2.3          | OpenCV_2.4.3_Manager_2.0_armv7a-neon.apk            |
-+----------------------------+-----------------+-----------------------------------------------------+
-| armeabi-v7a (arm-v7a-NEON) | 2.2             | OpenCV_2.4.3.1_Manager_2.3_armv7a-neon-android8.apk |
-+----------------------------+-----------------+-----------------------------------------------------+
-
+.. include:: ../readme.txt
 
 First application start
 -----------------------

diff --git a/android/service/readme.txt b/android/service/readme.txt
index 69b6236e6283129abe4ec5f681ceea264f17e565..7da05853ae77ff3db77e9ae08e0dfe795d309865 100644 (file)
--- a/android/service/readme.txt
+++ b/android/service/readme.txt
@@ -1,28 +1,33 @@
-OpenCV Manager selection
-========================
+How to select the proper version of OpenCV Manager
+--------------------------------------------------
 
-Since version 1.7 several packages of OpenCV Manager is built. Every package includes OpenCV library
-for package target platform. The internal library is used for most cases, except the rare one, when
-arm-v7a without NEON instruction set processor is detected. In this case additional binary package
-for arm-v7a is used. The new package selection logic in most cases simplifies OpenCV installation
-on end user devices. In most cases OpenCV Manager may be installed automatically from Google Play.
-For such case, when Google Play is not available, i.e. emulator, developer board, etc, you can
-install it manually using adb tool:
+Since version 1.7 several packages of OpenCV Manager are built. Every package is targeted for some
+specific hardware platform and includes corresponding OpenCV binaries. So, in most cases OpenCV
+Manager uses built-in version of OpenCV. Separate package with OpenCV binaries is currently used in
+a single rare case, when an ARMv7-A processor without NEON support is detected. In this case an
+additional binary package is used. The new package selection logic in most cases simplifies OpenCV
+installation on end user devices. In most cases OpenCV Manager may be installed automatically from
+Google Play.
 
-    adb install OpenCV-2.4.3-android-sdk/apk/OpenCV_2.4.3.2_Manager_2.4_<platform_name>.apk
+If Google Play is not available (i.e. on emulator, developer board, etc), you can install it
+manually using adb tool:
 
-Use table to determine right OpenCV Manager package:
+.. code-block:: sh
 
-+----------------------------+-----------------+-----------------------------------------------------+
-| Hardware Platform          | Android version | Package name                                        |
-+============================+=================+=====================================================+
-| Intel x86                  | >= 2.3          | OpenCV_2.4.3.2_Manager_2.4_x86.apk                  |
-+----------------------------+-----------------+-----------------------------------------------------+
-| MIPS                       | >= 2.3          | OpenCV_2.4.3.2_Manager_2.4_mips.apk                 |
-+----------------------------+-----------------+-----------------------------------------------------+
-| armeabi (arm-v5, arm-v6)   | >= 2.3          | OpenCV_2.4.3.2_Manager_2.4_armeabi.apk              |
-+----------------------------+-----------------+-----------------------------------------------------+
-| armeabi-v7a (arm-v7a-NEON) | >= 2.3          | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon.apk          |
-+----------------------------+-----------------+-----------------------------------------------------+
-| armeabi-v7a (arm-v7a-NEON) | 2.2             | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon-android8.apk |
-+----------------------------+-----------------+-----------------------------------------------------+
+    adb install OpenCV-2.4.3-android-sdk/apk/OpenCV_2.4.3.2_Manager_2.4_<platform>.apk
+
+Use the table below to determine proper OpenCV Manager package for your device:
+
++------------------------------+--------------+-----------------------------------------------------+
+| Hardware Platform            | Android ver. | Package name                                        |
++==============================+==============+=====================================================+
+| armeabi-v7a (ARMv7-A + NEON) |    >= 2.3    | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon.apk          |
++------------------------------+--------------+-----------------------------------------------------+
+| armeabi-v7a (ARMv7-A + NEON) |     = 2.2    | OpenCV_2.4.3.2_Manager_2.4_armv7a-neon-android8.apk |
++------------------------------+--------------+-----------------------------------------------------+
+| armeabi (ARMv5, ARMv6)       |    >= 2.3    | OpenCV_2.4.3.2_Manager_2.4_armeabi.apk              |
++------------------------------+--------------+-----------------------------------------------------+
+| Intel x86                    |    >= 2.3    | OpenCV_2.4.3.2_Manager_2.4_x86.apk                  |
++------------------------------+--------------+-----------------------------------------------------+
+| MIPS                         |    >= 2.3    | OpenCV_2.4.3.2_Manager_2.4_mips.apk                 |
++------------------------------+--------------+-----------------------------------------------------+