[Libreoffice-commits] online.git: 3 commits - android/app

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Apr 16 08:10:08 UTC 2019


 android/app/src/main/res/values/arrays.xml               |    7 +------
 android/app/src/main/res/values/dimens.xml               |    1 -
 android/app/src/main/res/values/strings.xml              |    8 +-------
 android/app/src/main/res/values/styles.xml               |    8 --------
 android/app/src/main/res/xml/libreoffice_preferences.xml |    3 +++
 5 files changed, 5 insertions(+), 22 deletions(-)

New commits:
commit 1797ca4b458f5764cc1ad80730f0c9c619e47a3f
Author:     kaishu-sahu <kaishusahu101 at gmail.com>
AuthorDate: Sun Jan 27 15:56:02 2019 +0530
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Apr 16 09:23:15 2019 +0200

    android: fix ArrayIndexOutOfBounds on selecting 'Drawings' in DefaultFileFilter setting
    
    Change-Id: I5ed924d9d79db169b11a0561b89da9b57eb078d9
    Reviewed-on: https://gerrit.libreoffice.org/66971
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index d88d9f320..116e7a4fc 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -6,6 +6,7 @@
         <item >0</item>
         <item >1</item>
         <item >2</item>
+        <item >3</item>
     </string-array>
     <string-array name="SupportedLanguagesValues">
         <item >en</item>
commit 3f896d749ff12e553e17e99da12df8c1ef851cf9
Author:     kaishu-sahu <kaishusahu101 at gmail.com>
AuthorDate: Sun Feb 3 01:44:20 2019 +0530
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Apr 16 09:23:14 2019 +0200

    android: Setting default values to setting preference, minor ux improvements
    
    Change-Id: I356871429f2e26d9d34e0e1428334a4d2287b683
    Reviewed-on: https://gerrit.libreoffice.org/67295
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/app/src/main/res/xml/libreoffice_preferences.xml b/android/app/src/main/res/xml/libreoffice_preferences.xml
index cd9104a93..eca0df51e 100644
--- a/android/app/src/main/res/xml/libreoffice_preferences.xml
+++ b/android/app/src/main/res/xml/libreoffice_preferences.xml
@@ -8,12 +8,14 @@
             android:summary="@string/pref_filter_summary"
             android:entries="@array/FilterTypeNames"
             android:entryValues="@array/FilterTypeStringValues"
+            android:defaultValue="-1"
             android:key="FILTER_MODE"/>
         <ListPreference
             android:summary="@string/pref_sort_summary"
             android:key="SORT_MODE"
             android:title="@string/pref_sort_title"
             android:entries="@array/SortModeNames"
+            android:defaultValue="0"
             android:entryValues="@array/SortModeStringValues"/>
         <ListPreference
             android:entries="@array/ViewModeNames"
@@ -28,6 +30,7 @@
             android:summary="@string/display_language_summary"
             android:entries="@array/SupportedLanguages"
             android:entryValues="@array/SupportedLanguagesValues"
+            android:defaultValue="en"
             android:key="DISPLAY_LANGUAGE"
             />
 
commit 264b6e941edc3f03bea0032983bf503554df9303
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Apr 16 09:11:30 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Apr 16 09:11:30 2019 +0200

    android: Cleanup unused resources.
    
    Change-Id: Ic1003da521d9496ee46ccbd72dd1935caa5e53c1

diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index f7bae3b3e..d88d9f320 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- View Mode names,values -->
-<integer-array name="FilterTypeValues">
-        <item >-1</item>
-        <item >0</item>
-        <item >1</item>
-        <item >2</item>
-    </integer-array>
     <string-array name="FilterTypeStringValues">
         <item >-1</item>
         <item >0</item>
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 5d512f7b3..57871ceb6 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -5,5 +5,4 @@
     <dimen name="file_icon_width">32dp</dimen>
     <dimen name="new_doc_fab_tweak_top">-11dp</dimen>
     <dimen name="new_doc_fab_tweak_bottom">-7dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
 </resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index d371bece6..dc1ceb6a0 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,8 +1,7 @@
 <resources>
     <!--string name="app_name" definition is deliberately missing here, it is filled in in build.gradle.-->
 
-    <string name="app_name_settings">LibreOffice Viewer Settings</string>
-    <string name="app_about_name"><b>LibreOffice Viewer \'Beta\'</b></string>
+    <string name="app_name_settings">Settings</string>
     <string name="app_version">Version: %1$s\nBuild ID: %2$s</string>
     <string name="app_description">LibreOffice Viewer is a document viewer based on LibreOffice.</string>
     <string name="app_credits">https://www.libreoffice.org</string>
@@ -17,13 +16,8 @@
     <string name="list_view">List</string>
     <string name="grid_view">Grid</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>
     <string name="pref_show_hidden_files">Hidden Files/Folders</string>
     <string name="pref_show_hidden_files_summary">Enable to show hidden files/folders</string>
-    <string name="pref_developer_mode">Developer Mode</string>
-    <string name="pref_developer_mode_summary">Enable developer mode where you can send UNO commands within app. Use at your own risk.</string>
     <string name="pref_sort_summary">Select how to order files: A-Z, by size or by date.</string>
     <string name="pref_viewmode_summary">View files as a grid or in a list.</string>
     <string name="pref_file_explorer_title">File explorer layout</string>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 26b02e569..a3bd6d6d2 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -3,12 +3,4 @@
     <!-- Base application theme. -->
 
 
-    <style name="LibreOfficeTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="LibreOfficeTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="LibreOfficeTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>


More information about the Libreoffice-commits mailing list