summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-10-03 19:58:59 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-10-03 22:54:37 +0200
commit20d5c4cce51284fd39d22755d19ac7a28ab51e14 (patch)
tree57a540644e137e43b2993459fa97bbe6b53b9cc4 /android
parentde376cb1c42543cd7717b0de88056ed4ab8af6d4 (diff)
android: make layouts nicer to work with by providing sample values in editor
Change-Id: I76495becb0257cb36340397d7296f26565fca4cd
Diffstat (limited to 'android')
-rw-r--r--android/source/res/layout/about.xml8
-rw-r--r--android/source/res/layout/document_part_list_layout.xml4
-rw-r--r--android/source/res/layout/file_explorer_grid_item.xml9
-rw-r--r--android/source/res/layout/file_list_item.xml8
-rw-r--r--android/source/res/menu/main.xml1
-rw-r--r--android/source/res/values/strings.xml3
6 files changed, 24 insertions, 9 deletions
diff --git a/android/source/res/layout/about.xml b/android/source/res/layout/about.xml
index 9882ab1a5ddf..e8d8322266b4 100644
--- a/android/source/res/layout/about.xml
+++ b/android/source/res/layout/about.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="20dip">
@@ -33,7 +35,7 @@
android:paddingTop="20dip"
android:text="@string/app_credits"
android:textColor="@android:color/secondary_text_light"
- android:textSize="18dip"/>
+ android:textSize="18sp"/>
<TextView
android:id="@+id/about_vendor"
diff --git a/android/source/res/layout/document_part_list_layout.xml b/android/source/res/layout/document_part_list_layout.xml
index 51ce0e0baea0..a20aeaff5afc 100644
--- a/android/source/res/layout/document_part_list_layout.xml
+++ b/android/source/res/layout/document_part_list_layout.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -8,13 +9,14 @@
<ImageView
android:id="@+id/image"
+ tools:src="@drawable/dummy_page"
android:layout_width="128dp"
android:layout_height="128dp"/>
<TextView
android:id="@+id/text"
+ tools:text="slide or page#"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Large Text"
android:textAppearance="?android:attr/textAppearanceLarge"/>
</LinearLayout> \ No newline at end of file
diff --git a/android/source/res/layout/file_explorer_grid_item.xml b/android/source/res/layout/file_explorer_grid_item.xml
index 5242f8f60f31..8dfb9ed0a613 100644
--- a/android/source/res/layout/file_explorer_grid_item.xml
+++ b/android/source/res/layout/file_explorer_grid_item.xml
@@ -6,6 +6,7 @@
file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="10dp"
@@ -13,22 +14,24 @@
<ImageView
android:id="@+id/grid_item_image"
+ tools:src="@drawable/folder"
android:layout_width="100dp"
android:layout_height="100dp"
android:scaleType="fitStart"
- android:layout_gravity="center">
+ android:layout_gravity="center"
+ android:contentDescription="@string/file_icon_desc" >
</ImageView>
<TextView
android:id="@+id/grid_item_label"
+ tools:text="file or dirname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@+id/label"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="10dp"
android:layout_gravity="center"
- android:textSize="15dp"
+ android:textSize="15sp"
android:textStyle="bold"
android:textColor="@android:color/secondary_text_light"
android:maxLines="2">
diff --git a/android/source/res/layout/file_list_item.xml b/android/source/res/layout/file_list_item.xml
index 17590fc7bfb4..352948817525 100644
--- a/android/source/res/layout/file_list_item.xml
+++ b/android/source/res/layout/file_list_item.xml
@@ -6,33 +6,39 @@
file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal" >
<ImageView
android:id="@+id/file_list_item_icon"
+ tools:src="@drawable/folder"
android:layout_height="match_parent"
android:layout_width="32dp"
android:layout_margin="8dp"
- android:layout_gravity="center"/>
+ android:layout_gravity="center"
+ android:contentDescription="@string/file_icon_desc" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<TextView
android:id="@+id/file_list_item_name"
+ tools:text="file or dirname"
style="@style/ListItemText"
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="2" />
<TextView
android:id="@+id/file_list_item_size"
+ tools:text="filesize"
style="@style/ListItemText"
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_weight="1" />
<TextView
android:id="@+id/file_list_item_date"
+ tools:text="date/time"
style="@style/ListItemText"
android:layout_height="match_parent"
android:layout_width="0dp"
diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml
index bf19105ebc1c..ccf0dce2b964 100644
--- a/android/source/res/menu/main.xml
+++ b/android/source/res/menu/main.xml
@@ -4,6 +4,7 @@
tools:context="org.libreoffice.MainActivity">
<group android:id="@+id/group_edit_actions"
+ tools:visible="true"
android:visible="false">
<item android:id="@+id/action_bold"
android:title="@string/action_bold"
diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml
index c7d6e6393dc1..78318b9f32ca 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -30,6 +30,7 @@
<string name="menu_sort_az">Sort A-Z</string>
<string name="menu_sort_modified">Sort by Date</string>
<string name="menu_preferences">Preferences</string>
+ <string name="file_icon_desc">fileicon</string>
<!-- Pref keys as resources ; Not currently used -->
<string name="EXPLORER_VIEW_TYPE_KEY">EXPLORER_VIEW_TYPE</string>
<string name="CURRENT_DIRECTORY_KEY">CURRENT_DIRECTORY</string>
@@ -66,7 +67,7 @@
<!-- Feedback messages -->
<string name="message_saved">Save complete</string>
- <string name="message_saving">Saving the document...</string>
+ <string name="message_saving">Saving the document…</string>
<string name="message_save_incomplete">Save incomplete. Were there any changes?</string>
<!-- Document provider settings -->