android tutorial v2, initial draft commit

android/service/doc/LoaderCallbackInterface.rst

@@ -8,7 +8,7 @@ Loader Callback Interface
     Interface for callback object in case of asynchronous initialization of OpenCV
 
 void onManagerConnected()
-------------------------
+-------------------------
 
 .. method:: void onManagerConnected(int status)
 

doc/tutorials/definitions/tocDefinitions.rst

@@ -2,6 +2,7 @@
 .. |Author_BernatG| unicode:: Bern U+00E1 t U+0020 G U+00E1 bor
 .. |Author_AndreyK| unicode:: Andrey U+0020 Kamaev
 .. |Author_LeonidBLB| unicode:: Leonid U+0020 Beynenson
+.. |Author_VsevolodG| unicode:: Vsevolod U+0020 Glumov
 .. |Author_VictorE| unicode:: Victor U+0020 Eruhimov 
 .. |Author_ArtemM| unicode:: Artem U+0020 Myagkov 
 .. |Author_FernandoI| unicode:: Fernando U+0020 Iglesias U+0020 Garc U+00ED a 

doc/tutorials/introduction/android_binary_package/android_binary_package_using_with_NDK.rst

@@ -4,7 +4,7 @@
 
 
 Using OpenCV in C++ code with OpenCV4Android SDK
-*********************************************
+************************************************
 
 The Android way is writing all your code in Java. But sometimes, it is not enough and you need to go to the native level and write some parts of your application in C/C++.
 This is especially important when you already have some computer vision code which is written in C++ and uses OpenCV, and you want to reuse it in your Android application.

doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.rst

@@ -105,8 +105,8 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-    
-  ================ ======================================================
+
+  ================ =================================================
   |AndroidBinPack| **Title:** :ref:`Android_Binary_Package`
 
                    *Compatibility:* > OpenCV 2.3.1
@@ -115,52 +115,98 @@ Here you can read tutorials about how to set up your computer to work with the O
 
                    You will learn how to setup OpenCV for Android platform!
 
-  ================ ======================================================
+  ================ =================================================
+
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+
+  ================ =================================================
+  |AndroidBinPack| **Title:** :ref:`Android_Binary_Package_with_NDK`
+
+                   *Compatibility:* > OpenCV 2.3.1
+
+                   *Author:* |Author_LeonidBLB|
+
+                   You will learn how to work with C++ OpenCV code for Android platform
+
+  ================ =================================================
 
      .. |AndroidBinPack| image:: images/android_logo.png
                            :height: 90pt
                            :width:  90pt
 
+
+* **Android** tutorials v2 [in progress]
+
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-    
-  ================ ======================================================
-  |AndroidNDKPack| **Title:** :ref:`Android_Binary_Package_with_NDK`
 
-                   *Compatibility:* > OpenCV 2.3.1
+  ================ =================================================
+  |AndroidNDKPack| **Title:** :ref:`Android_Dev_Intro`
 
-                   *Author:* |Author_LeonidBLB|
+                   *Compatibility:* > OpenCV 2.4.2
 
-                   You will learn how to work with C++ OpenCV code for Android platform
+                   *Author:* |Author_VsevolodG|
+
+                   Not a tutorial, but a guide introducing Android development basics and environment setup
+
+  ================ =================================================
+
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+
+  ================ =================================================
+  |AndroidNDKPack| **Title:** :ref:`O4A_SDK`
+
+                   *Compatibility:* > OpenCV 2.4.2
+
+                   *Author:* |Author_VsevolodG|
+
+                   OpenCV4Android SDK: general info, installation, running samples
 
-  ================ ======================================================
+  ================ =================================================
+
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+
+  ================ =================================================
+  |AndroidNDKPack| **Title:** :ref:`dev_with_OCV_on_Android`
+
+                   *Compatibility:* > OpenCV 2.4.2
+
+                   *Author:* |Author_VsevolodG|
+
+                   Development with OpenCV4Android SDK
+
+  ================ =================================================
 
      .. |AndroidNDKPack| image:: images/android_logo.png
                            :height: 90pt
                            :width:  90pt
 
-* **iOS**
 
-.. tabularcolumns:: m{100pt} m{300pt}
-.. cssclass:: toctableopencv
+* **iOS**
 
-=========== ======================================================
-|Install_2| **Title:** :ref:`iOS-Installation`
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
 
-            *Compatibility:* > OpenCV 2.3.1
+  =========== ======================================================
+  |Install_2| **Title:** :ref:`iOS-Installation`
 
-            *Author:* |Author_ArtemM|
+              *Compatibility:* > OpenCV 2.3.1
 
-            We will learn how to setup OpenCV for using it in iOS!
+              *Author:* |Author_ArtemM|
 
-=========== ======================================================
+              We will learn how to setup OpenCV for using it in iOS!
 
-.. |Install_2| image:: images/ios4_logo.jpg
-               :width:  90pt
+  =========== ======================================================
 
-.. tabularcolumns:: m{100pt} m{300pt}
-.. cssclass:: toctableopencv
+     .. |Install_2| image:: images/ios4_logo.jpg
+                 :width:  90pt
 
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+  
   ============= ======================================================
   |Beginners_1| **Title:** :ref:`Display_Image`
 
@@ -172,12 +218,12 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   ============= ======================================================
 
-  .. |Beginners_1| image:: images/Display_Image_Tutorial_Result.jpg
-                   :height: 90pt
-                   :width:  90pt
+     .. |Beginners_1| image:: images/Display_Image_Tutorial_Result.jpg
+                     :height: 90pt
+                     :width:  90pt
 
   .. tabularcolumns:: m{100pt} m{300pt}
-  .. cssclass:: toctableopencv  
+  .. cssclass:: toctableopencv
   
   =============== ======================================================
    |Beginners_2|  **Title:** :ref:`Load_Save_Image`
@@ -190,12 +236,15 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   =============== ======================================================
 
-  .. |Beginners_2| image:: images/Load_Save_Image_Result_1.jpg
-                   :height: 90pt
-                   :width:  90pt
+     .. |Beginners_2| image:: images/Load_Save_Image_Result_1.jpg
+                     :height: 90pt
+                     :width:  90pt
 
 * **Want to contribute, and see your own work between the OpenCV tutorials?**
 
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+  
   =============== ======================================================
    |HowToWriteT|  **Title:** :ref:`howToWriteTutorial`
 
@@ -226,6 +275,8 @@ Here you can read tutorials about how to set up your computer to work with the O
    ../windows_visual_studio_Opencv/windows_visual_studio_Opencv
    ../android_binary_package/android_binary_package
    ../android_binary_package/android_binary_package_using_with_NDK
+   ../android_binary_package/android_dev_intro
+   ../android_binary_package/dev_with_OCV_on_Android
    ../ios_install/ios_install
    ../display_image/display_image
    ../load_save_image/load_save_image