[Libreoffice-commits] .: android/experimental

[Iain Billett]

 android/experimental/LibreOffice4Android/proguard-project.txt                              |   20 ++++++++++
 android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java         |    2 +
 android/experimental/LibreOffice4Android/src/org/libreoffice/ui/GridItemAdapter.java       |    2 +
 android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java |    6 +++
 android/experimental/LibreOffice4Android/src/org/libreoffice/ui/ListItemAdapter.java       |    2 +
 android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PageView.java              |    2 +
 android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PreferenceEditor.java      |    2 +
 android/experimental/LibreOffice4Android/src/org/libreoffice/ui/WriterViewerActivity.java  |    2 +
 8 files changed, 38 insertions(+)

New commits:
commit 3e0c6d83d5b089c853154b5d03fcf33e5403520c
Author: Iain Billett <iainbillett at gmail.com>
Date:   Fri Jun 22 18:15:21 2012 +0100

    LibreOffice4Android now builds.

diff --git a/android/experimental/LibreOffice4Android/proguard-project.txt b/android/experimental/LibreOffice4Android/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/android/experimental/LibreOffice4Android/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
index 2e21dbe..2195caf 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
@@ -1,5 +1,7 @@
 package org.libreoffice.ui;
 
+import org.libreoffice.R;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FilenameFilter;
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/GridItemAdapter.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/GridItemAdapter.java
index 9585705..ffff46e 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/GridItemAdapter.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/GridItemAdapter.java
@@ -1,5 +1,7 @@
 package org.libreoffice.ui;
 
+import org.libreoffice.R;
+
 import java.io.File;
 
 import android.content.Context;
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index d1e46a9..abcdac7 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -1,5 +1,8 @@
 package org.libreoffice.ui;
 
+import org.libreoffice.R;
+//import org.libreoffice.android.examples.DocumentLoader;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FilenameFilter;
@@ -157,11 +160,14 @@ public class LibreOfficeUIActivity extends Activity implements OnNavigationListe
     }
     
     public void open(String 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 );
+    	
+    	//startActivity( new Intent( this , org.libreoffice.android.examples.DocumentLoader ) );
     }
     
     @Override
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/ListItemAdapter.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/ListItemAdapter.java
index 1e66e3a..edfdbd2 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/ListItemAdapter.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/ListItemAdapter.java
@@ -1,5 +1,7 @@
 package org.libreoffice.ui;
 
+import org.libreoffice.R;
+
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PageView.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PageView.java
index 5edb6ea..59033e1 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PageView.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PageView.java
@@ -1,5 +1,7 @@
 package org.libreoffice.ui;
 
+import org.libreoffice.R;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PreferenceEditor.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PreferenceEditor.java
index dec509d..3196813 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PreferenceEditor.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PreferenceEditor.java
@@ -1,5 +1,7 @@
 package org.libreoffice.ui;
 
+import org.libreoffice.R;
+
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.Preference;
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/WriterViewerActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/WriterViewerActivity.java
index fe2f113..7f04909 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/WriterViewerActivity.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/WriterViewerActivity.java
@@ -1,5 +1,7 @@
 package org.libreoffice.ui;
 
+import org.libreoffice.R;
+
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Intent;