[Libreoffice-commits] core.git: 2 commits - android/sdremote

[Artur Dryomov]

 android/sdremote/res/drawable/background_grid_slide.xml    |    2 +-
 android/sdremote/res/layout/activity_computer_creation.xml |    8 --------
 android/sdremote/res/layout/view_grid_slide.xml            |    1 -
 android/sdremote/res/values/dimens.xml                     |    1 -
 android/sdremote/res/values/strings.xml                    |    5 ++---
 5 files changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 46de4c598e9a78cc9a8401c701b75f434707d186
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date:   Thu Aug 1 17:00:35 2013 +0300

    Fix computer creation spelling.
    
    Replace a notice with different hint. Change error message to be
    shorter.
    
    Change-Id: I93f063bb07c37749466787d7a965893fc79a69bb

diff --git a/android/sdremote/res/layout/activity_computer_creation.xml b/android/sdremote/res/layout/activity_computer_creation.xml
index 4ef3f86..74751ea9 100644
--- a/android/sdremote/res/layout/activity_computer_creation.xml
+++ b/android/sdremote/res/layout/activity_computer_creation.xml
@@ -22,12 +22,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
-    <TextView
-        style="?textAppearanceSmall"
-        android:text="@string/message_name_notice"
-        android:gravity="center_horizontal"
-        android:paddingTop="@dimen/padding_vertical_notice"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/android/sdremote/res/values/dimens.xml b/android/sdremote/res/values/dimens.xml
index 9739e15..a5f9447 100644
--- a/android/sdremote/res/values/dimens.xml
+++ b/android/sdremote/res/values/dimens.xml
@@ -21,7 +21,6 @@
     <dimen name="padding_vertical_pin">8dp</dimen>
     <dimen name="padding_vertical_error_message">12dp</dimen>
     <dimen name="padding_vertical_edit">8dp</dimen>
-    <dimen name="padding_vertical_notice">16dp</dimen>
 
     <dimen name="margin_vertical_action_bar_divider">12dp</dimen>
     <dimen name="margin_slide">8dp</dimen>
diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml
index 2f5117a..92a2022 100644
--- a/android/sdremote/res/values/strings.xml
+++ b/android/sdremote/res/values/strings.xml
@@ -31,12 +31,11 @@
     <string name="message_impress_remote_enabling">Make sure you enabled remote control. Go to “Tools → Options → LibreOffice Impress → General” in LibreOffice Impress.</string>
     <string name="message_impress_wifi_enabling">You should enable experimental features at “Tools → Options → LibreOffice → Advanced” as well.</string>
     <string name="message_impress_pairing_check">If you have Bluetooth pairing issues check instructions related to your desktop OS.</string>
-    <string name="message_ip_address_validation">You should type a valid IP address.</string>
-    <string name="message_name_notice">Name is not required — IP address would be used instead if you wish.</string>
+    <string name="message_ip_address_validation">Type in a valid IP address.</string>
     <string name="message_time_is_up">Time is up</string>
 
     <string name="hint_ip_address">IP address</string>
-    <string name="hint_name">Name</string>
+    <string name="hint_name">Name (optional)</string>
 
     <string name="header_notes">Notes</string>
 
commit dc2e2d0068315500ed70880667802f1f52a77f70
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date:   Thu Aug 1 16:54:27 2013 +0300

    Remove custon scaling for GridView slide previews.
    
    Should make thinks less hacky.
    
    Change-Id: I007800558ce8a0a567addde3b01926bb53c311f6

diff --git a/android/sdremote/res/drawable/background_grid_slide.xml b/android/sdremote/res/drawable/background_grid_slide.xml
index 9c76602..e7fca36 100644
--- a/android/sdremote/res/drawable/background_grid_slide.xml
+++ b/android/sdremote/res/drawable/background_grid_slide.xml
@@ -12,6 +12,6 @@
         android:left="1dp"
         android:top="1dp"
         android:right="1dp"
-        android:bottom="1.5dp"/>
+        android:bottom="1dp"/>
 
 </shape>
\ No newline at end of file
diff --git a/android/sdremote/res/layout/view_grid_slide.xml b/android/sdremote/res/layout/view_grid_slide.xml
index a79ca3e..4c3d573 100644
--- a/android/sdremote/res/layout/view_grid_slide.xml
+++ b/android/sdremote/res/layout/view_grid_slide.xml
@@ -6,7 +6,6 @@
 
     <ImageView
         android:id="@+id/image_slide_preview"
-        android:scaleType="centerCrop"
         android:adjustViewBounds="true"
         android:background="@drawable/background_grid_slide"
         android:contentDescription="@string/description_grid_slide"