summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-10-10 07:34:44 +0200
committerJan Holesovsky <kendy@collabora.com>2014-10-10 07:35:46 +0200
commitdea50a9c463b4699c15f02363e49e7baf7388c80 (patch)
tree79765098c2a6fe24fc422adc90d80a0a5d1d2c18 /android
parentb9e8e8c1ae8727becb18488ef5efee929dc2448a (diff)
More tabs -> spaces.
Change-Id: I9a3e104b05479413dc314f299824a48ead004693
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/res/layout/document_viewer.xml34
-rw-r--r--android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml10
-rw-r--r--android/experimental/LOAndroid3/res/layout/file_grid.xml22
-rw-r--r--android/experimental/LOAndroid3/res/layout/file_list.xml10
-rw-r--r--android/experimental/LOAndroid3/res/layout/file_list_item.xml58
-rw-r--r--android/experimental/LOAndroid3/res/layout/main.xml2
-rw-r--r--android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml20
-rw-r--r--android/experimental/LOAndroid3/res/values/arrays.xml6
-rw-r--r--android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml24
9 files changed, 93 insertions, 93 deletions
diff --git a/android/experimental/LOAndroid3/res/layout/document_viewer.xml b/android/experimental/LOAndroid3/res/layout/document_viewer.xml
index 62f5556cb148..b4f450164039 100644
--- a/android/experimental/LOAndroid3/res/layout/document_viewer.xml
+++ b/android/experimental/LOAndroid3/res/layout/document_viewer.xml
@@ -7,27 +7,27 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
+ android:layout_height="match_parent"
android:id="@+id/document_viewer_root">
- <ViewFlipper
+ <ViewFlipper
android:id="@+id/page_flipper"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
+ android:layout_height="match_parent" >
+
</ViewFlipper>
- <HorizontalScrollView
+ <HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignBottom="@id/page_flipper"
- android:scrollbarAlwaysDrawHorizontalTrack="true"
- android:background="#aa000000">
- <LinearLayout
- android:id="@+id/navigator"
- android:layout_width="wrap_content"
- android:layout_height="120dp"
- android:layout_margin="15dp"
- android:orientation="horizontal">
- </LinearLayout>
- </HorizontalScrollView >
+ android:layout_alignBottom="@id/page_flipper"
+ android:scrollbarAlwaysDrawHorizontalTrack="true"
+ android:background="#aa000000">
+ <LinearLayout
+ android:id="@+id/navigator"
+ android:layout_width="wrap_content"
+ android:layout_height="120dp"
+ android:layout_margin="15dp"
+ android:orientation="horizontal">
+ </LinearLayout>
+ </HorizontalScrollView>
-</RelativeLayout> \ No newline at end of file
+</RelativeLayout>
diff --git a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
index 585a805ffe7a..e4569e028553 100644
--- a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
+++ b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
@@ -10,15 +10,15 @@
android:layout_height="match_parent"
android:paddingTop="10dp"
android:orientation="vertical" >
-
- <ImageView
+
+ <ImageView
android:id="@+id/grid_item_image"
android:layout_width="100dp"
android:layout_height="142dp"
android:scaleType="fitStart"
android:layout_gravity="center">
</ImageView>
-
+
<TextView
android:id="@+id/grid_item_label"
android:layout_width="wrap_content"
@@ -28,9 +28,9 @@
android:paddingRight="10dp"
android:paddingTop="10dp"
android:layout_gravity="center"
- android:textSize="15dp"
+ android:textSize="15dp"
android:textStyle="bold"
android:maxLines="2">
</TextView>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/android/experimental/LOAndroid3/res/layout/file_grid.xml b/android/experimental/LOAndroid3/res/layout/file_grid.xml
index 72eb6618d5fa..42b745b821fe 100644
--- a/android/experimental/LOAndroid3/res/layout/file_grid.xml
+++ b/android/experimental/LOAndroid3/res/layout/file_grid.xml
@@ -12,16 +12,16 @@
<GridView
android:id="@+id/file_explorer_grid_view"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:columnWidth="120dp"
- android:numColumns="auto_fit"
- android:verticalSpacing="10dp"
- android:horizontalSpacing="10dp"
- android:stretchMode="columnWidth"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:columnWidth="120dp"
+ android:numColumns="auto_fit"
+ android:verticalSpacing="10dp"
+ android:horizontalSpacing="10dp"
+ android:stretchMode="columnWidth"
android:background="#ffeeeeee"
- android:gravity="center">
+ android:gravity="center">
</GridView>
-
-
-</LinearLayout> \ No newline at end of file
+
+
+</LinearLayout>
diff --git a/android/experimental/LOAndroid3/res/layout/file_list.xml b/android/experimental/LOAndroid3/res/layout/file_list.xml
index 6fe21b605744..48dfb1e31267 100644
--- a/android/experimental/LOAndroid3/res/layout/file_list.xml
+++ b/android/experimental/LOAndroid3/res/layout/file_list.xml
@@ -10,11 +10,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
-
+
<ListView
android:id="@+id/file_explorer_list_view"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- ></ListView>
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+ </ListView>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/android/experimental/LOAndroid3/res/layout/file_list_item.xml b/android/experimental/LOAndroid3/res/layout/file_list_item.xml
index 07a6f4264211..91d84fdf6f5d 100644
--- a/android/experimental/LOAndroid3/res/layout/file_list_item.xml
+++ b/android/experimental/LOAndroid3/res/layout/file_list_item.xml
@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal" >
- <ImageView
+ <ImageView
android:id="@+id/file_list_item_icon"
android:layout_height="match_parent"
android:layout_width="32dp"
@@ -17,31 +17,31 @@
android:layout_gravity="center"/>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="48dp"
- android:orientation="horizontal">
- <TextView
- android:id="@+id/file_list_item_name"
- android:layout_height="48dp"
- android:layout_width="0dp"
- android:textSize="15dp"
- android:textStyle="bold"
- android:layout_weight="2"
- android:gravity="center"/>
- <TextView
- android:id="@+id/file_list_item_size"
- android:layout_height="48dp"
- android:layout_width="0dp"
- android:textSize="15dp"
- android:textStyle="bold"
- android:layout_weight="1"
- android:gravity="center"/>
- <TextView
- android:id="@+id/file_list_item_date"
- android:layout_height="48dp"
- android:layout_width="0dp"
- android:textSize="15dp"
- android:textStyle="bold"
- android:layout_weight="2"
- android:gravity="center"/>
- </LinearLayout>
-</LinearLayout> \ No newline at end of file
+ android:layout_height="48dp"
+ android:orientation="horizontal">
+ <TextView
+ android:id="@+id/file_list_item_name"
+ android:layout_height="48dp"
+ android:layout_width="0dp"
+ android:textSize="15dp"
+ android:textStyle="bold"
+ android:layout_weight="2"
+ android:gravity="center"/>
+ <TextView
+ android:id="@+id/file_list_item_size"
+ android:layout_height="48dp"
+ android:layout_width="0dp"
+ android:textSize="15dp"
+ android:textStyle="bold"
+ android:layout_weight="1"
+ android:gravity="center"/>
+ <TextView
+ android:id="@+id/file_list_item_date"
+ android:layout_height="48dp"
+ android:layout_width="0dp"
+ android:textSize="15dp"
+ android:textStyle="bold"
+ android:layout_weight="2"
+ android:gravity="center"/>
+ </LinearLayout>
+</LinearLayout>
diff --git a/android/experimental/LOAndroid3/res/layout/main.xml b/android/experimental/LOAndroid3/res/layout/main.xml
index 75768c36b200..0264e28f7e47 100644
--- a/android/experimental/LOAndroid3/res/layout/main.xml
+++ b/android/experimental/LOAndroid3/res/layout/main.xml
@@ -17,6 +17,6 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
-
+
</LinearLayout> \ No newline at end of file
diff --git a/android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml b/android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml
index 8b305e1deba6..20ad60f3c855 100644
--- a/android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml
+++ b/android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml
@@ -9,15 +9,15 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="150dp"
android:layout_height="150dp"
- android:layout_gravity="center"
- android:background="#00880000"
+ android:layout_gravity="center"
+ android:background="#00880000"
android:orientation="vertical" >
<!-- Can I give all thumbs the same ID? works in grid adapter "getView" -->
- <ImageView
- android:src="@drawable/dummy_page"
- android:id="@+id/thumbnail"
- android:layout_width="120dp"
- android:layout_height="120dp"
- android:layout_margin="15dp"
- android:layout_gravity="center"/>
-</LinearLayout> \ No newline at end of file
+ <ImageView
+ android:src="@drawable/dummy_page"
+ android:id="@+id/thumbnail"
+ android:layout_width="120dp"
+ android:layout_height="120dp"
+ android:layout_margin="15dp"
+ android:layout_gravity="center"/>
+</LinearLayout>
diff --git a/android/experimental/LOAndroid3/res/values/arrays.xml b/android/experimental/LOAndroid3/res/values/arrays.xml
index 67a157d201bf..0d698c704830 100644
--- a/android/experimental/LOAndroid3/res/values/arrays.xml
+++ b/android/experimental/LOAndroid3/res/values/arrays.xml
@@ -29,7 +29,7 @@
<item >0</item>
<item >1</item>
</string-array>
-
+
<!-- Preference Name Arrays -->
<string-array name="file_view_modes">
<item >EVERYTHING</item>
@@ -51,6 +51,6 @@
<item >Largest First</item>
<item >Smallest First</item>
</string-array>
-
-
+
+
</resources> \ No newline at end of file
diff --git a/android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml b/android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml
index d19d9e65298c..f6da06f13aaf 100644
--- a/android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml
+++ b/android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
- <ListPreference
+ <ListPreference
android:title="Default File Filter"
android:summary="Set which files to show by default"
- android:entries="@array/FilterTypeNames"
- android:entryValues="@array/FilterTypeStringValues"
+ android:entries="@array/FilterTypeNames"
+ android:entryValues="@array/FilterTypeStringValues"
android:key="FILTER_MODE"/>
- <ListPreference
- android:summary="Select how to order files; A-Z, by size, etc."
- android:key="SORT_MODE"
+ <ListPreference
+ android:summary="Select how to order files; A-Z, by size, etc."
+ android:key="SORT_MODE"
android:title="File Order" android:entries="@array/SortModeNames" android:entryValues="@array/SortModeStringValues"/>
- <ListPreference
- android:entries="@array/ViewModeNames"
- android:entryValues="@array/ViewModeStringValues"
- android:title="Default File Explorer View"
- android:key="EXPLORER_VIEW_TYPE"
+ <ListPreference
+ android:entries="@array/ViewModeNames"
+ android:entryValues="@array/ViewModeStringValues"
+ android:title="Default File Explorer View"
+ android:key="EXPLORER_VIEW_TYPE"
android:summary="View files as a grid or in a list. #not functional, yet."/>
-
+
</PreferenceScreen> \ No newline at end of file