Merged the recent fixes from 2.4 branch

android/service/doc/AsyncServiceHelper.rst

@@ -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

android/service/doc/IOpenCVEngine.rst

@@ -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

android/service/doc/Intro.rst

@@ -1,3 +1,6 @@
+
+.. _Android_OpenCV_Manager_Intro:
+
 ************
 Introduction
 ************

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

android/service/doc/NativeHelper.rst

@@ -1,5 +0,0 @@
-********************
-Native OpenCV Helper
-********************
-
-.. highlight:: cpp

android/service/doc/OpenCVEngineInterface.rst

@@ -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
- 

android/service/doc/StaticHelper.rst

@@ -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

android/service/doc/index.rst

@@ -1,3 +1,6 @@
+
+.. _Android_OpenCV_Manager:
+
 ***********************
 Android OpenCV Manager
 ***********************

android/service/engine/AndroidManifest.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.opencv.engine"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="11"
+    android:versionName="1.1" >
 
     <uses-sdk android:minSdkVersion="8" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 
     <application
         android:icon="@drawable/icon"
@@ -21,7 +22,7 @@
         	<action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
-    </activity> 
+    </activity>
     
 </application>
 </manifest>

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" />
 
     <TextView
         android:id="@+id/textView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="This application allows you to manage OpenCV library on your device."
+        android:text="OpenCV library (www.opencv.org) is used by other applications for image enhancement, panorama stitching, object detection, recognition and tracking and so on. OpenCV Manager provides the best version of the OpenCV for your hardware."
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <LinearLayout
@@ -47,7 +47,7 @@
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Device information:"
+        android:text="Device information"
         android:textAppearance="?android:attr/textAppearanceLarge" android:layout_marginTop="20dp"/>
 
     <LinearLayout
@@ -101,7 +101,7 @@
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Installed packages:"
+        android:text="Installed packages"
         android:textAppearance="?android:attr/textAppearanceLarge" android:layout_marginTop="15dp"/>
 
     <ListView
@@ -114,6 +114,6 @@
         android:id="@+id/CheckEngineUpdate"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Check Manager update" />
+        android:text="Check for update" />
 
 </LinearLayout>