From 3e0c6d83d5b089c853154b5d03fcf33e5403520c Mon Sep 17 00:00:00 2001 From: Iain Billett Date: Fri, 22 Jun 2012 18:15:21 +0100 Subject: LibreOffice4Android now builds. --- .../LibreOffice4Android/proguard-project.txt | 20 ++++++++++++++++++++ .../src/org/libreoffice/ui/FileUtilities.java | 2 ++ .../src/org/libreoffice/ui/GridItemAdapter.java | 2 ++ .../org/libreoffice/ui/LibreOfficeUIActivity.java | 6 ++++++ .../src/org/libreoffice/ui/ListItemAdapter.java | 2 ++ .../src/org/libreoffice/ui/PageView.java | 2 ++ .../src/org/libreoffice/ui/PreferenceEditor.java | 2 ++ .../src/org/libreoffice/ui/WriterViewerActivity.java | 2 ++ 8 files changed, 38 insertions(+) create mode 100644 android/experimental/LibreOffice4Android/proguard-project.txt diff --git a/android/experimental/LibreOffice4Android/proguard-project.txt b/android/experimental/LibreOffice4Android/proguard-project.txt new file mode 100644 index 000000000000..f2fe1559a217 --- /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 2e21dbe5da61..2195caf5068d 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 9585705d5e06..ffff46e39537 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 d1e46a9b543d..abcdac7089ce 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 1e66e3a0501c..edfdbd29619e 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 5edb6ea20926..59033e110325 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 dec509de1167..3196813ce760 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 fe2f1135b3a0..7f04909ccae6 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; -- cgit