From 38cc47f8b1715525cf4a2ccaab7464e9ed1c734c Mon Sep 17 00:00:00 2001
From: "Siqi LIU (via Code Review)" <gerrit@gerrit.libreoffice.org>
Date: Fri, 12 Apr 2013 23:49:21 +0000
Subject: fdo#61873 - add WiFi experimental feature alert.

fixes reconnect crash. Won't crash when server-end disconnect.

seperate Client construction and initialization so that Client()
will release its mutex lock and won't block service.run().
Otherwise onBackPressed() will be blocked in PairingActivity

Change-Id: I424a470aa02b0c74b28cb9f9ba79489aa0d4ab1b
---
 android/sdremote/res/layout/activity_reconnect.xml | 12 +++++++++++-
 android/sdremote/res/layout/dialog_addserver.xml   | 12 +++++++++++-
 android/sdremote/res/values/strings.xml            |  6 +++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'android/sdremote/res')

diff --git a/android/sdremote/res/layout/activity_reconnect.xml b/android/sdremote/res/layout/activity_reconnect.xml
index 8baa76d1a73f..0d2f8bb75de4 100644
--- a/android/sdremote/res/layout/activity_reconnect.xml
+++ b/android/sdremote/res/layout/activity_reconnect.xml
@@ -40,7 +40,17 @@
             android:gravity="center_horizontal"
             android:text="@string/reconnect_description2"
             android:textAppearance="?android:attr/textAppearanceMedium" />
+        
+        <TextView
+            android:id="@+id/countDownTV"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center_horizontal"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/android/sdremote/res/layout/dialog_addserver.xml b/android/sdremote/res/layout/dialog_addserver.xml
index 01ddba28c73c..475aabd6d7a1 100644
--- a/android/sdremote/res/layout/dialog_addserver.xml
+++ b/android/sdremote/res/layout/dialog_addserver.xml
@@ -3,8 +3,18 @@
     android:id="@+id/addserver_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:padding="12dp"
     android:orientation="vertical" >
 
+    <TextView
+        android:id="@+id/wifiAlertMsg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        android:text="@string/wifiAlertMsg"
+        android:textStyle="italic"
+        android:typeface="serif" />
+
     <TextView
         android:id="@+id/addserver_namelabel"
         android:layout_width="wrap_content"
@@ -43,4 +53,4 @@
         android:checked="true"
         android:text="@string/addserver_remember" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index a08edd1345ae..84edffc8a3f7 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -7,6 +7,7 @@
     <string name="presentation_ui_resizehandle">Handle to resize view.</string>
     <string name="presentation_blank_screen">Blank Screen</string>
     <string name="options">Options</string>
+    <string name="reconnect">Reconnect...</string>
     <string name="actionbar_timeformat">h:mmaa</string>
     <string name="actionbar_timerformat">mm:ss</string>
     <string name="clock_timer_start">Start</string>
@@ -15,6 +16,8 @@
     <string name="clock_timer_reset">Reset</string>
     <string name="clock_timer_resume">Resume</string>
     <string name="options_autodecline">Decline Calls</string>
+    <string name="help">Help</string>
+    <string name="ConnectionFailedHelp">#1 Verify Impress is running \n#2 For Bluetooth user, enable \"Preference\"-\"LibreOffice Impress\"-\"General\"-\"Enable remote control\"\n#3 For WiFi user, tick \"Preferece\"-\"LibreOffice\"-\"Advanced\"-\"Enable Experimental Features\" \n </string>
     <string name="options_description">Automatically decline all incoming calls.</string>
     <string name="options_volumeswitching">Volume Switching</string>
     <string name="options_volumeswitching_descripton">Change slides using volume buttons</string>
@@ -49,6 +52,7 @@
     <string name="addserver_add">Add</string>
     <string name="addserver_cancel">Cancel</string>
     <string name="reconnect_description1">Your connection has been dropped.</string>
-    <string name="reconnect_description2">Attempting to reconnect…</string>
+    <string name="reconnect_description2">Please try to reconnect</string>
+    <string name="wifiAlertMsg">This is still an experimental feature. You need to \"enable experimental features\" in \"Preference\"-\"LibreOffice\"-\"Advanced\" on your computer. \nThe use over Bluetooth is recommanded.</string>
 
 </resources>
-- 
cgit