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

[Miklos Vajna]

 android/experimental/LOAndroid3/res/values/arrays.xml                            |    9 ++++++---
 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java   |    9 ++++++---
 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java |    4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 0897aae2c7759015a5b71d705240ac00ce5ddedd
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Dec 19 09:38:42 2014 +0100

    android doc browser: hide Calc filter, add Draw filter
    
    Hide Calc filter, as ATM Calc documents are not supported. Draw filter
    was just missing, add it.
    
    Change-Id: I88b9e48319e584f1c86de1b970badcdd695f30ed

diff --git a/android/experimental/LOAndroid3/res/values/arrays.xml b/android/experimental/LOAndroid3/res/values/arrays.xml
index 0d698c7..2263b47 100644
--- a/android/experimental/LOAndroid3/res/values/arrays.xml
+++ b/android/experimental/LOAndroid3/res/values/arrays.xml
@@ -30,13 +30,16 @@
         <item >1</item>
     </string-array>
 
-    <!-- Preference Name Arrays -->
+    <!-- Preference Name Arrays
+         This has to be in sync with FileUtilities.java. -->
     <string-array name="file_view_modes">
         <item >EVERYTHING</item>
         <item >DOCUMENTS</item>
-        <item >SPREADSHEETS</item>
+        <!-- <item>SPREADSHEETS</item> -->
         <item >PRESENTATIONS</item>
+        <item>DRAWINGS</item>
     </string-array>
+
     <string-array name="FilterTypeNames">
         <item >Everything</item>
         <item >Documents</item>
@@ -53,4 +56,4 @@
     </string-array>
 
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
index baff933..3c67947 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
@@ -21,10 +21,13 @@ import android.util.Log;
 
 public class FileUtilities {
     static final int ALL = -1;
+
+    // These have to be in sync with the file_view_modes resource.
     static final int DOC = 0;
-    static final int CALC = 1;
-    static final int IMPRESS = 2;
-    static final int DRAWING = 3;
+    // static final int CALC = 1;
+    static final int IMPRESS = 1;
+    static final int DRAWING = 2;
+
     static final int UNKNOWN = 10;
 
     static final int SORT_AZ = 0;
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
index 22f7b9b..d0470e7 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -127,9 +127,9 @@ public class GridItemAdapter extends BaseAdapter {
                     }
                     imageView.setImageResource(R.drawable.writer);
                     break;
-                case FileUtilities.CALC:
+                /*case FileUtilities.CALC:
                     imageView.setImageResource(R.drawable.calc);
-                    break;
+                    break;*/
                 case FileUtilities.DRAWING: // FIXME: only for now ...
                 case FileUtilities.IMPRESS:
                     imageView.setImageResource(R.drawable.impress);