[Libreoffice-commits] core.git: android/source

[aleksandar-stefanovic]

 android/source/res/values/integers.xml             |    6 ++++++
 android/source/res/values/strings.xml              |    3 +--
 android/source/res/xml/libreoffice_preferences.xml |   10 +++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit ce1fec5f5d23676e2a02dde062f9b678d4d1dfd0
Author: aleksandar-stefanovic <theonewithideas at gmail.com>
Date:   Thu Feb 9 10:39:01 2017 +0100

    Changed description of setting entries
    
    Changed to make more sense to non-tech-savvy users.
    See https://material.io/guidelines/style/writing.html for
    writing guidelines.
    
    Changed grid default value from string to integer, since the value
    is effectively an integer, and no point in being a string.
    
    Change-Id: I6c1737927e7f9d20536756c3cb8b7059cf49500b
    Reviewed-on: https://gerrit.libreoffice.org/34074
    Reviewed-by: Aleksandar Stefanović <theonewithideas at gmail.com>
    Tested-by: Aleksandar Stefanović <theonewithideas at gmail.com>

diff --git a/android/source/res/values/integers.xml b/android/source/res/values/integers.xml
new file mode 100644
index 0000000..aeb71c3
--- /dev/null
+++ b/android/source/res/values/integers.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <integer name="grid_view_integer">0</integer>
+
+</resources>
\ No newline at end of file
diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml
index 197aeab..f1e4e32 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -20,7 +20,6 @@
     <string name="menu_search">Search</string>
     <string name="list_view">List</string>
     <string name="grid_view">Grid</string>
-    <string name="GRID_VIEW_INTEGER">0</string>
     <string name="filter">Filter by</string>
     <string name="sort">Sort by</string>
     <string name="sort_smallest">Smallest first</string>
@@ -39,7 +38,7 @@
     <!-- 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>
-    <string name="pref_category_explorer">Explorer View Defaults</string>
+    <string name="pref_category_explorer">File Explorer Settings</string>
     <string name="pref_category_general">General</string>
     <string name="pref_experimental_editing">Experimental Mode</string>
     <string name="pref_experimental_editing_summary">Enable the experimental editing mode. Use at your own risk.</string>
diff --git a/android/source/res/xml/libreoffice_preferences.xml b/android/source/res/xml/libreoffice_preferences.xml
index 5dd5a70..347709b 100644
--- a/android/source/res/xml/libreoffice_preferences.xml
+++ b/android/source/res/xml/libreoffice_preferences.xml
@@ -5,21 +5,21 @@
         android:key="PREF_CATEGORY_EXPLORER">
         <ListPreference
             android:title="Default File Filter"
-            android:summary="Set which files to show by default"
+            android:summary="Set which file filter should be used by default."
             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:summary="Select how to order files: A-Z, by size or by date."
             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:defaultValue="@string/GRID_VIEW_INTEGER"
-            android:title="Default File Explorer View"
+            android:defaultValue="@integer/grid_view_integer"
+            android:title="File explorer layout"
             android:key="EXPLORER_VIEW_TYPE"
-            android:summary="View files as a grid or in a list."/>
+            android:summary="View files as a grid or in a list." />
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/pref_category_general"