diff --git a/android/java.rst b/android/java.rst
index b5e3070d28..37b393bd89 100644
--- a/android/java.rst
+++ b/android/java.rst
@@ -3,4 +3,4 @@ Java API
********
-`Java API reference external link (JavaDoc) `_
\ No newline at end of file
+Java API reference (JavaDoc): external `link `_.
diff --git a/android/service/doc/BaseLoaderCallback.rst b/android/service/doc/BaseLoaderCallback.rst
index d75003877c..3258004c59 100644
--- a/android/service/doc/BaseLoaderCallback.rst
+++ b/android/service/doc/BaseLoaderCallback.rst
@@ -1,18 +1,20 @@
*********************************************
-Base Loader Callback Interface implementation
+Base Loader Callback Interface Implementation
*********************************************
.. highlight:: java
.. class:: BaseLoaderCallback
- Basic implementation of LoaderCallbackInterface. Logic of this implementation is well-described by the following scheme:
+ Basic implementation of ``LoaderCallbackInterface``. Logic of this implementation is
+ well-described by the following scheme:
.. image:: img/AndroidAppUsageModel.png
Using in Java Activity
----------------------
-There is a very base code snippet implementing the async initialization with BaseLoaderCallback. See the "15-puzzle" OpenCV sample for details.
+There is a very base code snippet implementing the async initialization with ``BaseLoaderCallback``.
+See the "15-puzzle" OpenCV sample for details.
.. code-block:: java
:linenos:
@@ -42,7 +44,7 @@ There is a very base code snippet implementing the async initialization with Bas
@Override
protected void onResume()
{
- Log.i(TAG, "called onResume");
+ Log.i(TAG, "Called onResume");
super.onResume();
Log.i(TAG, "Trying to load OpenCV library");
@@ -55,6 +57,7 @@ There is a very base code snippet implementing the async initialization with Bas
Using in Service
----------------
-Default BaseLoaderCallback implementation treat application context as Activity and calls Activity.finish() method to exit in case of initialization failure.
-To override this behavior you need to override finish() method of BaseLoaderCallback class and implement your own finalization method.
-
+Default ``BaseLoaderCallback`` implementation treats application context as ``Activity`` and calls
+``Activity.finish()`` method to exit in case of initialization failure.
+To override this behavior you need to override ``finish()`` method of ``BaseLoaderCallback`` class
+and implement your own finalization method.
diff --git a/android/service/doc/InstallCallbackInterface.rst b/android/service/doc/InstallCallbackInterface.rst
index 950b8ec244..f4411f93f4 100644
--- a/android/service/doc/InstallCallbackInterface.rst
+++ b/android/service/doc/InstallCallbackInterface.rst
@@ -28,7 +28,7 @@ void cancel()
.. method:: void cancel()
- Installation if package has been canceled.
+ Installation of package has been cancelled.
void wait_install()
-------------------
diff --git a/android/service/doc/Intro.rst b/android/service/doc/Intro.rst
index 4319090862..d0e9d73470 100644
--- a/android/service/doc/Intro.rst
+++ b/android/service/doc/Intro.rst
@@ -7,34 +7,38 @@ Introduction
.. highlight:: java
-OpenCV Manager is an Android service targeted to manage OpenCV library binaries on end users devices. It allows sharing the OpenCV dynamic libraries of different versions between applications on the same device. The Manager provides the following benefits\:
+OpenCV Manager is an Android service targeted to manage OpenCV library binaries on end users devices.
+It allows sharing the OpenCV dynamic libraries between applications on the same device. The Manager
+provides the following benefits\:
#. Less memory usage. All apps use the same binaries from service and do not keep native libs inside themselves;
#. Hardware specific optimizations for all supported platforms;
-#. Trusted OpenCV library source. All packages with OpenCV are published on Google Play service;
+#. Trusted OpenCV library source. All packages with OpenCV are published on Google Play market;
#. Regular updates and bug fixes;
-Usage model for target user
----------------------------
+Usage model for end user
+------------------------
.. image:: img/AndroidAppUsageModel.png
First OpenCV app\:
#. Any OpenCV-dependent app is installed from Google Play marketplace or manually;
-#. At the first launch, it suggests installing OpenCV Manager;
-#. Then OpenCV Manager is downloaded and installed, using Google Play marketplace service.
-#. When Manager has ben started, the application suggests installing OpenCV library for the target device trough Google Play marketplace if it is necessary;
-#. After installation is finished, the app may be launched to perform common tasks.
+#. At the first launch, it suggests installation of OpenCV Manager;
+#. Then OpenCV Manager is downloaded and installed, using the Google Play application.
+#. When Manager has been started, the application suggests installation of OpenCV library for the
+ target device architecture if it is necessary;
+#. After the installation is finished, the app may be launched.
-Next OpenCV app\:
+Subsequent launches of OpenCV apps\:
-#. Any OpenCV-dependent app is installed from Google Play marketplace or manually;
+#. Any OpenCV-dependent app is installed from Google Play market or manually;
#. At the first launch, the app starts as usually;
-#. If the selected version is not installed, OpenCV Manager suggests installing OpenCV library for the target device trough Google Play marketplace;
-#. After installation is finished, the app may be launched to perform common tasks.
+#. If the selected OpenCV version is not installed, OpenCV Manager suggests installing OpenCV
+ library for the target device through Google Play marketplace;
+#. After the installation is finished, the app may be launched.
-OpenCV Manager structure
-------------------------
+Architecture of OpenCV Manager
+------------------------------
.. image:: img/Structure.png
\ No newline at end of file
diff --git a/android/service/doc/JavaHelper.rst b/android/service/doc/JavaHelper.rst
index 102b727d72..9a128db0ab 100644
--- a/android/service/doc/JavaHelper.rst
+++ b/android/service/doc/JavaHelper.rst
@@ -12,23 +12,27 @@ boolean initDebug()
.. method:: static boolean initDebug()
- Loads and initializes OpenCV library from within current application package. Roughly it is analog of ``system.loadLibrary("opencv_java")``.
+ Loads and initializes OpenCV library from within current application package. Roughly it is
+ analog of ``system.loadLibrary("opencv_java")``.
:rtype: boolean;
:return: returns true if initialization of OpenCV was successful.
-.. note:: This method is deprecated for production code. It is designed for experimantal and local development purposes only. If you want to publish your app use approach with async initialization.
+.. note:: This method is deprecated for production code. It is designed for experimental and local
+ development purposes only. If you want to publish your app use approach with async
+ initialization.
boolean initAsync()
-------------------
.. method:: static boolean initAsync(String Version, Context AppContext, LoaderCallbackInterface Callback)
- Loads and initializes OpenCV library using OpenCV Manager service.
+ Loads and initializes OpenCV library using OpenCV Manager.
:param Version: OpenCV Library version.
:param AppContext: application context for connecting to the service.
- :param Callback: object, that implements LoaderCallbackInterface for handling connection status (see BaseLoaderCallback).
+ :param Callback: object, that implements ``LoaderCallbackInterface`` for handling connection
+ status (see ``BaseLoaderCallback``).
:rtype: boolean;
:return: returns true if initialization of OpenCV starts successfully.
@@ -43,10 +47,3 @@ OpenCV version constants
.. data:: OPENCV_VERSION_2_4_3
OpenCV Library version 2.4.3
-
-Other constatnts
-----------------
-
-.. data:: OPEN_CV_SERVICE_URL
-
- Url for OpenCV Manager on Google Play (Android Market)
\ No newline at end of file
diff --git a/android/service/doc/LoaderCallbackInterface.rst b/android/service/doc/LoaderCallbackInterface.rst
index 08bc160961..440b6b6737 100644
--- a/android/service/doc/LoaderCallbackInterface.rst
+++ b/android/service/doc/LoaderCallbackInterface.rst
@@ -12,9 +12,9 @@ void onManagerConnected()
.. method:: void onManagerConnected(int status)
- Callback method that is called after OpenCV Library initialization.
+ Callback method that is called after OpenCV library initialization.
- :param status: status of initialization (see Initialization Status Constants).
+ :param status: status of initialization (see "Initialization Status Constants" section below).
void onPackageInstall()
-----------------------
@@ -23,7 +23,7 @@ void onPackageInstall()
Callback method that is called in case when package installation is needed.
- :param callback: answer object with approve and cancel methods and package description.
+ :param callback: answer object with ``install`` and ``cancel`` methods and package description.
Initialization status constants
-------------------------------
@@ -34,15 +34,15 @@ Initialization status constants
.. data:: MARKET_ERROR
- Google Play (Android Market) cannot be invoked
+ Google Play (Android Market) application cannot be invoked
.. data:: INSTALL_CANCELED
- OpenCV library installation was canceled by user
+ OpenCV library installation was cancelled by user
.. data:: INCOMPATIBLE_MANAGER_VERSION
- Version of OpenCV Manager Service is incompatible with this app. Service update is needed
+ Version of OpenCV Manager is incompatible with this app. Manager update is needed.
.. data:: INIT_FAILED
diff --git a/android/service/doc/UseCases.rst b/android/service/doc/UseCases.rst
index 59d6215b8e..bbc7da02c3 100644
--- a/android/service/doc/UseCases.rst
+++ b/android/service/doc/UseCases.rst
@@ -20,7 +20,7 @@ If OpenCV library installation has been approved\:
.. image:: img/LibInstallAproved.png
-If OpenCV library installation has been canceled\:
+If OpenCV library installation has been cancelled\:
.. image:: img/LibInstallCanceled.png