[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 2 commits - android/experimental

[Tomaž Vajngerl]

 android/experimental/LOAndroid3/res/layout/about.xml                                  |   13 +++++-----
 android/experimental/LOAndroid3/res/values/strings.xml                                |   10 ++++---
 android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java |   10 +++++--
 3 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit 13ecf84e85d7511dce76238b4fcc1f1dc0b5c29b
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Wed Oct 1 19:56:01 2014 +0200

    android: about dialog description, app names - viewer & browser
    
    Change-Id: I4f759b6a004ca8f12974f3d0daa9f1d78c015f2a

diff --git a/android/experimental/LOAndroid3/res/layout/about.xml b/android/experimental/LOAndroid3/res/layout/about.xml
index f1222dc..ec014a0 100644
--- a/android/experimental/LOAndroid3/res/layout/about.xml
+++ b/android/experimental/LOAndroid3/res/layout/about.xml
@@ -12,17 +12,18 @@
         android:layout_height="wrap_content"
         android:text="@string/app_description"
         android:textColor="@android:color/secondary_text_light"
-        android:textSize="16sp"/>
+        android:textSize="18sp"/>
 
     <TextView
         android:id="@+id/about_credits"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:autoLink="web"
+        android:paddingBottom="20dip"
         android:paddingTop="20dip"
         android:text="@string/app_credits"
         android:textColor="@android:color/secondary_text_light"
-        android:textSize="16dip"/>
+        android:textSize="18dip"/>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:layout_width="match_parent"
@@ -33,15 +34,15 @@
             android:id="@+id/about_license_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="License"
-            />
+            android:layout_marginRight="12dp"
+            android:text="License"/>
 
         <Button
             android:id="@+id/about_notice_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Notice"
-            />
+            android:layout_marginRight="12dp"
+            android:text="Notice"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml
index 74dee00..d04f92e 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">LibreOffice</string>
-    <string name="app_description">Description</string>
-    <string name="app_credits">Credits</string>
+    <string name="app_name">LibreOffice Viewer</string>
 
-    <string name="browser_app_name">LibreOfficeUI</string>
+    <string name="app_about_name"><b>LibreOffice Viewer \'Beta\'</b></string>
+    <string name="app_description">LibreOffice Viewer is an document viewer based on LibreOffice</string>
+    <string name="app_credits">http://www.libreoffice.com</string>
+
+    <string name="browser_app_name">LibreOffice Browser</string>
     <string name="menu_search">Search</string>
     <string name="list_view">List</string>
     <string name="grid_view">Grid</string>
commit c733d163136de22c73a9c25bdb05a90a342f7bd4
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Wed Oct 1 19:54:08 2014 +0200

    android: clicking "Parts" in preferences opens the side drawer
    
    Change-Id: I3cfd0a31409f6a798c933dae4a47b75e93601f6b

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index a37438e..1fce7d4 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -63,9 +63,13 @@ public class LibreOfficeMainActivity extends Activity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
-        if (id == R.id.action_about) {
-            showAbout();
-            return true;
+        switch (id) {
+            case R.id.action_about:
+                showAbout();
+                return true;
+            case R.id.action_parts:
+                mDrawerLayout.openDrawer(mDrawerList);
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }