summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacobo Aragunde Pérez <jaragunde@igalia.com>2014-09-12 13:32:00 +0200
committerTomaž Vajngerl <quikee@gmail.com>2014-09-18 20:53:17 +0000
commit966fe14af2c8782d7f16f732a73761a60b345bb1 (patch)
treec7fcbf5c2e4a17e61ec2c68c183899efd526c3a8
parent71832a527a936bbb8e76154cbd3ffc491ea31b58 (diff)
Android browser: open documents with the new viewer
Change-Id: Iae63a8ec591df912938e74d67cb173f591c2a93d Reviewed-on: https://gerrit.libreoffice.org/11488 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java18
1 files changed, 5 insertions, 13 deletions
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 96e425143ade..feb74b3b4162 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