Minor fixes: boot option for HTC devices, aesthetic changes in preferences, new suppo...

diff --git a/android/src/console/.classpath b/android/src/console/.classpath
index 2059ffa..84b0cf7 100644 (file)
--- a/android/src/console/.classpath
+++ b/android/src/console/.classpath
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="gen"/>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-       <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
        <classpathentry exported="true" kind="lib" path="libs/simple-xml-2.6.4.jar"/>
        <classpathentry exported="true" kind="lib" path="libs/achartengine-1.0.0.jar"/>
        <classpathentry kind="lib" path="libs/android-support-v4.jar"/>
@@ -11,5 +10,7 @@
        <classpathentry kind="lib" path="libs/netxms-base-1.2.8.jar"/>
        <classpathentry kind="lib" path="libs/netxms-client-1.2.8.jar"/>
        <classpathentry kind="lib" path="libs/netxms-client-api-1.2.8.jar"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="gen"/>
        <classpathentry kind="output" path="bin/classes"/>
 </classpath>

diff --git a/android/src/console/AndroidManifest.xml b/android/src/console/AndroidManifest.xml
index d3d3959..474c7e0 100644 (file)
--- a/android/src/console/AndroidManifest.xml
+++ b/android/src/console/AndroidManifest.xml
@@ -1,13 +1,14 @@
 <?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.7" android:versionCode="8">
-       <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="8"></uses-sdk>
+       <uses-sdk android:targetSdkVersion="18" 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" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.READ_LOGS"/>
+    
     <application android:name="NXApplication"
                  android:icon="@drawable/icon"
                  android:allowBackup="true"
@@ -17,6 +18,7 @@
        <receiver android:name="org.netxms.ui.android.receivers.BootCompletedIntentReceiver">  
                        <intent-filter>  
                                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                               <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                                <category android:name="android.intent.category.HOME" />                
                        </intent-filter>  
                </receiver>

diff --git a/android/src/console/libs/android-support-v4.jar b/android/src/console/libs/android-support-v4.jar
index 65ebaf8..cf12d28 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/res/values/strings.xml b/android/src/console/res/values/strings.xml
index f0141e3..1fa6337 100644 (file)
--- a/android/src/console/res/values/strings.xml
+++ b/android/src/console/res/values/strings.xml
@@ -12,7 +12,7 @@
        <string name="reconnect">Reconnect</string>
        <string name="tools">Tools</string>
        <string name="confirm_tool_execution">Confirm execution</string>
-       <string name="no_items">No items to show...</string>
+       <string name="no_items">No items to show&#8230;</string>
                                        
        <string name="progress_gathering_data">Gathering data&#8230;</string>
        <string name="progress_processing_data">Processing data&#8230;</string>
@@ -28,17 +28,17 @@
        <string name="home_screen_macaddress">MACaddress</string>
                        
     <string name="settings">Settings</string>
-       <string name="pref_encrypt_summary_disabled">Do not use encryption</string>
-    <string name="pref_encrypt_summary_enabled">Use encryption</string>
     <string name="pref_encrypt">Encrypt connection</string>
-    <string name="pref_password_summary">NetXMS password</string>
+    <string name="pref_encrypt_summary_disabled">Connection is in clear</string>
+    <string name="pref_encrypt_summary_enabled">Encryption is negotiated</string>
     <string name="pref_password">Password</string>
-    <string name="pref_login_summary">NetXMS login name</string>
+    <string name="pref_password_summary">NetXMS password</string>
     <string name="pref_login">User name</string>
-    <string name="pref_server_summary">Name or address of NetXMS server</string>
+    <string name="pref_login_summary">NetXMS login name</string>
     <string name="pref_server">Server</string>
-    <string name="pref_port_summary">Port of NetXMS server</string>
+    <string name="pref_server_summary">Name or address of NetXMS server</string>
     <string name="pref_port">Port</string>
+    <string name="pref_port_summary">Port of NetXMS server</string>
     <string name="pref_global">Global settings</string>
     <string name="pref_connection">Connection</string>
     <string name="pref_parameters">Parameters</string>
@@ -46,7 +46,7 @@
     <string name="pref_scheduler_enable">Enable scheduler</string>
     <string name="pref_scheduler_enabled">Scheduler is enabled</string>
     <string name="pref_scheduler_disabled">Scheduler is disabled</string>
-    <string name="pref_scheduler_daily_enable">Enable scheduler</string>
+    <string name="pref_scheduler_daily_enable">Daily scheduler</string>
     <string name="pref_scheduler_daily_enabled">Daily scheduler is enabled</string>
     <string name="pref_scheduler_daily_disabled">Daily scheduler is disabled</string>
     <string name="pref_scheduler_daily_on">Daily activation on</string>
@@ -56,8 +56,8 @@
        <string name="pref_scheduler_activation_duration">Duration (min)</string>
        <string name="pref_scheduler_activation_duration_summary">For how much it should be kept on</string>
        <string name="pref_global_autostart">Auto start on boot</string>
-       <string name="pref_global_autostart_enabled">Auto start service on boot</string>
-       <string name="pref_global_autostart_disabled">Do not auto start service on boot</string>
+       <string name="pref_global_autostart_enabled">Allow automatic start of service</string>
+       <string name="pref_global_autostart_disabled">Block automatic start of service</string>
        <string name="pref_notifications">Notifications</string>
        <string name="pref_status">Connection status</string>
        <string name="pref_alarms">Alarms</string>
@@ -68,15 +68,15 @@
        <string name="pref_alarm_sound_major">Major alarm sound</string>
        <string name="pref_alarm_sound_critical">Critical alarm sound</string>
        <string name="pref_global_notification_toast">Toast notification</string>
-       <string name="pref_global_notification_toast_enabled">Toast notification enabled</string>
-       <string name="pref_global_notification_toast_disabled">Toast notification disabled</string>
+       <string name="pref_global_notification_toast_enabled">Toast is enabled</string>
+       <string name="pref_global_notification_toast_disabled">Toast is disabled</string>
        <string name="pref_global_notification_icon">Icon notification</string>
-       <string name="pref_global_notification_icon_enabled">Icon notification in status bar enabled</string>
-       <string name="pref_global_notification_icon_disabled">Icon notification in status bar disabled</string>
+       <string name="pref_global_notification_icon_enabled">Icon in status bar is enabled</string>
+       <string name="pref_global_notification_icon_disabled">Icon in status bar is disabled</string>
        <string name="pref_global_notification_status">Notification behaviour</string>
        <string name="pref_global_notification_alarm">Alarm notification</string>
-       <string name="pref_global_notification_alarm_enabled">Alarm notification in status bar enabled</string>
-       <string name="pref_global_notification_alarm_disabled">Alarm notification in status bar disabled</string>
+       <string name="pref_global_notification_alarm_enabled">Alarm in status bar is enabled</string>
+       <string name="pref_global_notification_alarm_disabled">Alarm in status bar is disabled</string>
        <string name="pref_interface">Interface</string>
        <string name="pref_multipliers">Multipliers</string>
        <string name="pref_multiplier_title">Choose multiplier</string>
@@ -234,14 +234,4 @@
        <string name="menu_poll_configuration">Configuration</string>
        <string name="menu_poll_topology">Topology</string>
        <string name="menu_poll_interfaces">Interface names</string>
-       
-       
-    <string name="fragment_tabs">Fragment/Tabs</string>
-       <string name="new_fragment">Add new</string>
-    <string name="delete_fragment">Pop top</string>
-    <string name="hello_world"><b>Hello, <i>World!</i></b></string>
-    <string name="first">First</string>
-    <string name="last">Last</string>
-       
-       
 </resources>

diff --git a/android/src/console/res/xml/preference_connection.xml b/android/src/console/res/xml/preference_connection.xml
index 971e9e8..1bb53b3 100644 (file)
--- a/android/src/console/res/xml/preference_connection.xml
+++ b/android/src/console/res/xml/preference_connection.xml
@@ -11,7 +11,7 @@
                <CheckBoxPreference android:summaryOn="@string/pref_scheduler_enabled" android:key="global.scheduler.enable" android:title="@string/pref_scheduler_enable" android:summaryOff="@string/pref_scheduler_disabled" android:defaultValue="false"/>
                <EditTextPreference android:title="@string/pref_scheduler_activation_interval" android:summary="@string/pref_scheduler_activation_interval_summary" android:enabled="true" android:defaultValue="15" android:key="global.scheduler.interval" android:digits="0123456789" android:dependency="global.scheduler.enable"></EditTextPreference>
                <EditTextPreference android:title="@string/pref_scheduler_activation_duration" android:summary="@string/pref_scheduler_activation_duration_summary" android:enabled="true" android:defaultValue="1" android:key="global.scheduler.duration" android:digits="0123456789" android:dependency="global.scheduler.enable"></EditTextPreference>
-               <CheckBoxPreference android:summaryOn="@string/pref_scheduler_daily_enabled" android:key="global.scheduler.daily.enable" android:title="@string/pref_scheduler_daily_enabled" android:summaryOff="@string/pref_scheduler_daily_disabled" android:defaultValue="false" android:dependency="global.scheduler.enable"/>
+               <CheckBoxPreference android:summaryOn="@string/pref_scheduler_daily_enabled" android:key="global.scheduler.daily.enable" android:title="@string/pref_scheduler_daily_enable" android:summaryOff="@string/pref_scheduler_daily_disabled" android:defaultValue="false" android:dependency="global.scheduler.enable"/>
                <org.netxms.ui.android.main.settings.TimePreference android:key="global.scheduler.daily.on" android:title="@string/pref_scheduler_daily_on" android:dependency="global.scheduler.daily.enable"/> 
                <org.netxms.ui.android.main.settings.TimePreference android:key="global.scheduler.daily.off" android:title="@string/pref_scheduler_daily_off" android:dependency="global.scheduler.daily.enable"/>
        </PreferenceCategory>

diff --git a/android/src/console/res/xml/preference_global.xml b/android/src/console/res/xml/preference_global.xml
index 2cc33d0..3494b83 100644 (file)
--- a/android/src/console/res/xml/preference_global.xml
+++ b/android/src/console/res/xml/preference_global.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-       <PreferenceCategory android:title="@string/pref_global">
-           <CheckBoxPreference android:summaryOff="@string/pref_global_autostart_disabled" android:summaryOn="@string/pref_global_autostart_enabled" android:key="global.autostart" android:enabled="true" android:defaultValue="false" android:title="@string/pref_global_autostart"/>
-       </PreferenceCategory>
+    <CheckBoxPreference android:summaryOff="@string/pref_global_autostart_disabled" android:summaryOn="@string/pref_global_autostart_enabled" android:key="global.autostart" android:enabled="true" android:defaultValue="false" android:title="@string/pref_global_autostart"/>
 </PreferenceScreen>

diff --git a/android/src/console/res/xml/preference_interface.xml b/android/src/console/res/xml/preference_interface.xml
index bac7a1b..b30ca5e 100644 (file)
--- a/android/src/console/res/xml/preference_interface.xml
+++ b/android/src/console/res/xml/preference_interface.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-       <PreferenceCategory android:title="@string/pref_interface">
-               <ListPreference android:dialogTitle="@string/pref_multiplier_title" android:key="global.multipliers" android:title="@string/pref_multipliers" android:entryValues="@array/multiplier_values" android:entries="@array/multiplier_labels" android:defaultValue="1" />
-       </PreferenceCategory>
+       <ListPreference android:dialogTitle="@string/pref_multiplier_title" android:key="global.multipliers" android:title="@string/pref_multipliers" android:entryValues="@array/multiplier_values" android:entries="@array/multiplier_labels" android:defaultValue="1" />
 </PreferenceScreen>

diff --git a/android/src/console/src/org/netxms/ui/android/receivers/ConnectivityChangeIntentReceiver.java b/android/src/console/src/org/netxms/ui/android/receivers/ConnectivityChangeIntentReceiver.java
index 5794b99..c024fe2 100644 (file)
--- a/android/src/console/src/org/netxms/ui/android/receivers/ConnectivityChangeIntentReceiver.java
+++ b/android/src/console/src/org/netxms/ui/android/receivers/ConnectivityChangeIntentReceiver.java
@@ -20,6 +20,7 @@ import android.preference.PreferenceManager;
 \r
 public class ConnectivityChangeIntentReceiver extends BroadcastReceiver\r
 {\r
+       @SuppressWarnings("deprecation")\r
        @Override\r
        public void onReceive(Context context, Intent intent)\r
        {\r