Added support for KitKat Wear and Lollipop. New support library.

diff --git a/ChangeLog b/ChangeLog
index d92de33..ca433a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
 - Management console:
     - New dashboard element "DCI summary table"
     - Cluster objects shown on status maps
+- Android console:
+    - Support for KitKat Wear and Lollipop
 - Fixed issues: #381, #565, #634, #667, #673, #674, #675, #678, #684, #688
 
 

diff --git a/android/src/agent/AndroidManifest.xml b/android/src/agent/AndroidManifest.xml
index b80cb0c..c91bc01 100644 (file)
--- a/android/src/agent/AndroidManifest.xml
+++ b/android/src/agent/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.netxms.agent.android" android:versionName="1.2.17" android:versionCode="4">
-       <uses-sdk android:targetSdkVersion="20" android:minSdkVersion="8"></uses-sdk>
+       <uses-sdk android:targetSdkVersion="22" android:minSdkVersion="8"></uses-sdk>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/android/src/agent/libs/android-support-v4.jar b/android/src/agent/libs/android-support-v4.jar
index c31cede..ac4181f 100644 (file)
Binary files a/android/src/agent/libs/android-support-v4.jar and b/android/src/agent/libs/android-support-v4.jar differ

diff --git a/android/src/agent/project.properties b/android/src/agent/project.properties
index a5578ba..bbe203c 100644 (file)
--- a/android/src/agent/project.properties
+++ b/android/src/agent/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-19
+target=android-21

diff --git a/android/src/agent/src/org/netxms/agent/android/helpers/DeviceInfoHelper.java b/android/src/agent/src/org/netxms/agent/android/helpers/DeviceInfoHelper.java
index deaf899..40df88c 100644 (file)
--- a/android/src/agent/src/org/netxms/agent/android/helpers/DeviceInfoHelper.java
+++ b/android/src/agent/src/org/netxms/agent/android/helpers/DeviceInfoHelper.java
@@ -161,6 +161,10 @@ public class DeviceInfoHelper
                                return "ANDROID (JELLY_BEAN_MR2)";
                        case Build.VERSION_CODES.KITKAT:
                                return "ANDROID (KITKAT)";
+                       case Build.VERSION_CODES.KITKAT_WATCH:
+                               return "ANDROID (KITKAT_WATCH)";
+                       case Build.VERSION_CODES.LOLLIPOP:
+                               return "ANDROID (LOLLIPOP)";
                }
                return "ANDROID (UNKNOWN)";
        }

diff --git a/android/src/console/AndroidManifest.xml b/android/src/console/AndroidManifest.xml
index 234711d..a4d0996 100644 (file)
--- a/android/src/console/AndroidManifest.xml
+++ b/android/src/console/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.netxms.ui.android" android:versionName="1.2.17" android:versionCode="10">
-       <uses-sdk android:targetSdkVersion="20" android:minSdkVersion="8"></uses-sdk>
+       <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="8"></uses-sdk>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/android/src/console/libs/android-support-v4.jar b/android/src/console/libs/android-support-v4.jar
index c31cede..ac4181f 100644 (file)
Binary files a/android/src/console/libs/android-support-v4.jar and b/android/src/console/libs/android-support-v4.jar differ

diff --git a/android/src/console/project.properties b/android/src/console/project.properties
index a5578ba..bbe203c 100644 (file)
--- a/android/src/console/project.properties
+++ b/android/src/console/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-19
+target=android-21