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

[Jacobo Aragunde Pérez]

 
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
 |   18 ++--------
 1 file changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 966fe14af2c8782d7f16f732a73761a60b345bb1
Author: Jacobo Aragunde Pérez <jaragu...@igalia.com>
Date:   Fri Sep 12 13:32:00 2014 +0200

    Android browser: open documents with the new viewer
    
    Change-Id: Iae63a8ec591df912938e74d67cb173f591c2a93d
    Reviewed-on: https://gerrit.libreoffice.org/11488
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    Tested-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 96e4251..feb74b3 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -228,19 +228,11 @@ public class LibreOfficeUIActivity extends Activity 
implements ActionBar.OnNavig
     }
     
     public void open(File file) {
-       /*
-       Intent i = new Intent( this , WriterViewerActivity.class );
-       i.putExtra( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath() 
);
-       i.putExtra( FILTER_MODE_KEY  , filterMode );
-       i.putExtra( EXPLORER_VIEW_TYPE_KEY  , viewMode );
-       startActivity( i );
-       */
-       Intent i = new Intent( this , DocumentLoader.class );
-        i.putExtra("input", file.getAbsolutePath() );
-       i.putExtra( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath() 
);
-       i.putExtra( FILTER_MODE_KEY  , filterMode );
-       i.putExtra( EXPLORER_VIEW_TYPE_KEY  , viewMode );
-       startActivity( i );
+        Intent i = new Intent(Intent.ACTION_VIEW, Uri.fromFile(file));
+        i.setComponent(new ComponentName(
+                "org.libreoffice",
+                "org.libreoffice.LibreOfficeMainActivity"));
+        startActivity(i);
     }
     
     @Override

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits