Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3365
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/3365/1
fdo#61873 WiFi experimental alerts and Clients synchronisation improvement
Change-Id: I7f31c764159ad0b17491f9a3e535bc1808c05e29
---
M android/sdremote/res/layout/activity_reconnect.xml
M android/sdremote/res/layout/dialog_addserver.xml
M android/sdremote/res/values/strings.xml
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/android/sdremote/res/layout/activity_reconnect.xml
b/android/sdremote/res/layout/activity_reconnect.xml
index 8baa76d..0fbdc78 100644
--- a/android/sdremote/res/layout/activity_reconnect.xml
+++ b/android/sdremote/res/layout/activity_reconnect.xml
@@ -41,6 +41,16 @@
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 01ddba2..475aabd 100644
--- a/android/sdremote/res/layout/dialog_addserver.xml
+++ b/android/sdremote/res/layout/dialog_addserver.xml
@@ -3,7 +3,17 @@
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"
@@ -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 a08edd1..57e328f 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 go back 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>
--
To view, visit https://gerrit.libreoffice.org/3365
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f31c764159ad0b17491f9a3e535bc1808c05e29
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Siqi LIU <me@siqi.fr>
Context
- [PATCH] fdo#61873 WiFi experimental alerts and Clients synchronisati... · Siqi LIU (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.