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

[Miklos Vajna]

 android/experimental/LOAndroid3/AndroidManifest.xml.in |   29 ++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 90a94db73c6c9c1ec0a10e248fd8c1eff955b375
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Dec 15 16:29:10 2014 +0100

    android: don't associate with ods, fods, ots, xls, xlsx, xltx and csv
    
    It's pointless to do that till Calc tiled rendering is not supported on
    master.
    
    Change-Id: Ib1ba01c18621d0a6e39ed45052ced715defaa4d4

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index b14074a..119046a8 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -35,14 +35,15 @@
                 <data android:mimeType="application/vnd.oasis.opendocument.text" />
                 <data android:mimeType="application/vnd.oasis.opendocument.graphics" />
                 <data android:mimeType="application/vnd.oasis.opendocument.presentation" />
-                <data android:mimeType="application/vnd.oasis.opendocument.spreadsheet" />
+                <!-- Calc. <data android:mimeType="application/vnd.oasis.opendocument.spreadsheet"/> -->
                 <data android:mimeType="application/vnd.oasis.opendocument.text-flat-xml" />
                 <data android:mimeType="application/vnd.oasis.opendocument.graphics-flat-xml" />
                 <data android:mimeType="application/vnd.oasis.opendocument.presentation-flat-xml" />
-                <data android:mimeType="application/vnd.oasis.opendocument.spreadsheet-flat-xml" />
+                <!-- Calc. <data android:mimeType="application/vnd.oasis.opendocument.spreadsheet-flat-xml" /> -->
 
                 <!-- ODF templates -->
                 <data android:mimeType="application/vnd.oasis.opendocument.text-template"/>
+                <!-- Calc. <data android:mimeType="application/vnd.oasis.opendocument.spreadsheet-template"/> -->
                 <data android:mimeType="application/vnd.oasis.opendocument.graphics-template"/>
                 <!-- Seems at least Anroid 5.0 does not recognize this as the mime type of .otp files. -->
                 <data android:mimeType="application/vnd.oasis.opendocument.presentation-template"/>
@@ -52,24 +53,25 @@
                 <data android:mimeType="text/rtf" />
                 <data android:mimeType="application/msword" />
                 <data android:mimeType="application/vnd.ms-powerpoint" />
-                <data android:mimeType="application/vnd.ms-excel" />
+                <!-- Calc. <data android:mimeType="application/vnd.ms-excel"/> -->
                 <data android:mimeType="application/vnd.visio" />
                 <data android:mimeType="application/vnd.visio.xml" />
                 <data android:mimeType="application/x-mspublisher" />
 
                 <!-- OOXML -->
-                <data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" />
+                <!-- Calc. <data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" /> -->
                 <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" />
                 <!-- Currently crashes. <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.slideshow"/> -->
                 <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />
 
                 <!-- OOXML templates -->
                 <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.template"/>
+                <!-- Calc. <data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.template"/> -->
                 <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.template"/>
 
                 <!-- OTHER -->
-                <data android:mimeType="text/csv" />
-                <data android:mimeType="text/spreadsheet" />
+                <!-- Calc. <data android:mimeType="text/csv"/>-->
+                <!-- Calc. <data android:mimeType="text/spreadsheet"/> -->
                 <data android:mimeType="application/vnd.ms-works" />
                 <data android:mimeType="application/vnd.apple.keynote" />
                 <data android:mimeType="application/x-abiword" />
commit 7992c34a1759c25781854f6230ec27eb33222003
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Dec 15 16:24:38 2014 +0100

    android: associate with ott, otg, otp, dotx and potx files as well
    
    Change-Id: If77eb099cb132ea889f623b895b32b3eef223d76

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index 8eb4dbb..b14074a 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -31,7 +31,7 @@
                 <action android:name="android.intent.action.PICK" />
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <!-- ODT -->
+                <!-- ODF -->
                 <data android:mimeType="application/vnd.oasis.opendocument.text" />
                 <data android:mimeType="application/vnd.oasis.opendocument.graphics" />
                 <data android:mimeType="application/vnd.oasis.opendocument.presentation" />
@@ -41,6 +41,12 @@
                 <data android:mimeType="application/vnd.oasis.opendocument.presentation-flat-xml" />
                 <data android:mimeType="application/vnd.oasis.opendocument.spreadsheet-flat-xml" />
 
+                <!-- ODF templates -->
+                <data android:mimeType="application/vnd.oasis.opendocument.text-template"/>
+                <data android:mimeType="application/vnd.oasis.opendocument.graphics-template"/>
+                <!-- Seems at least Anroid 5.0 does not recognize this as the mime type of .otp files. -->
+                <data android:mimeType="application/vnd.oasis.opendocument.presentation-template"/>
+
                 <!-- MS -->
                 <data android:mimeType="application/rtf" />
                 <data android:mimeType="text/rtf" />
@@ -54,8 +60,13 @@
                 <!-- OOXML -->
                 <data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" />
                 <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" />
+                <!-- Currently crashes. <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.slideshow"/> -->
                 <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />
 
+                <!-- OOXML templates -->
+                <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.template"/>
+                <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.template"/>
+
                 <!-- OTHER -->
                 <data android:mimeType="text/csv" />
                 <data android:mimeType="text/spreadsheet" />
@@ -85,3 +96,5 @@
     </application>
 
 </manifest>
+<!-- vim: shiftwidth=4 softtabstop=4 expandtab:
+-->