[Libreoffice-commits] core.git: 73 commits - android/experimental android/README desktop/source editeng/source include/LibreOfficeKit include/svx include/vcl libreofficekit/source sc/inc sc/source sd/CppunitTest_sd_tiledrendering.mk sd/Module_sd.mk sd/qa sd/source svx/README svx/source sw/inc sw/source vcl/source
Siqi Liu
me at siqi.fr
Tue Apr 7 00:19:16 PDT 2015
android/README | 145 ++
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.classpath | 8
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.project | 33
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.settings/org.eclipse.jdt.core.prefs | 11
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/AndroidManifest.xml | 28
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/proguard.cfg | 40
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/project.properties | 11
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_explorer_grid_item.xml | 29
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_grid.xml | 20
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list.xml | 13
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list_item.xml | 41
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/main.xml | 15
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/menu/view_menu.xml | 20
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/arrays.xml | 56 -
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/strings.xml | 16
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/xml/libreoffice_preferences.xml | 21
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/FileUtilities.java | 159 --
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/GridItemAdapter.java | 95 -
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/LibreOfficeUIActivity.java | 548 ----------
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/ListItemAdapter.java | 159 --
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PageView.java | 63 -
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PreferenceEditor.java | 18
android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/WriterViewerActivity.java | 37
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.classpath | 8
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.project | 33
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/AndroidManifest.xml | 23
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/proguard-project.txt | 20
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/project.properties | 14
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/layout/main.xml | 12
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/values/strings.xml | 7
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Mesh.java | 259 ----
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/Page.java | 90 -
android/experimental/GSoC-2012-eclipse-workspace/TextturePage/src/libreoffice/android/ui/TextturePageActivity.java | 227 ----
android/experimental/LOAndroid3/Makefile | 1
android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png |binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png |binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png |binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png |binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png |binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png |binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png |binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png |binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png |binary
android/experimental/LOAndroid3/res/layout/text_selection_handles.xml | 24
android/experimental/LOAndroid3/res/menu/main.xml | 28
android/experimental/LOAndroid3/res/values/strings.xml | 4
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java | 33
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java | 9
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitInputConnectionHandler.java | 6
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java | 6
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 10
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 2
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 26
android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java | 4
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/BitmapHandle.java | 61 +
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java | 15
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java | 21
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java | 36
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java | 58 -
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java | 19
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java | 69 +
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleEnd.java | 23
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java | 35
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleStart.java | 35
android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorLayer.java | 51
android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java | 203 ++-
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelection.java | 141 --
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java | 190 ---
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RectUtils.java | 11
desktop/source/lib/init.cxx | 21
dev/null |binary
editeng/source/editeng/editeng.cxx | 1
editeng/source/editeng/impedit3.cxx | 2
editeng/source/outliner/outliner.cxx | 1
include/LibreOfficeKit/LibreOfficeKit.h | 24
include/LibreOfficeKit/LibreOfficeKit.hxx | 60 +
include/svx/sdr/table/tablecontroller.hxx | 2
include/svx/selectioncontroller.hxx | 2
include/vcl/ITiledRenderable.hxx | 7
libreofficekit/source/gtk/lokdocview.cxx | 437 ++++---
sc/inc/docuno.hxx | 3
sc/source/ui/inc/gridwin.hxx | 2
sc/source/ui/inc/viewdata.hxx | 4
sc/source/ui/unoobj/docuno.cxx | 84 +
sc/source/ui/view/gridwin.cxx | 114 +-
sc/source/ui/view/gridwin2.cxx | 37
sc/source/ui/view/gridwin3.cxx | 10
sc/source/ui/view/gridwin4.cxx | 71 -
sc/source/ui/view/viewdata.cxx | 65 -
sd/CppunitTest_sd_tiledrendering.mk | 63 +
sd/Module_sd.mk | 1
sd/qa/unit/tiledrendering/data/dummy.odp |binary
sd/qa/unit/tiledrendering/tiledrendering.cxx | 190 +++
sd/source/ui/inc/ViewShell.hxx | 2
sd/source/ui/inc/Window.hxx | 2
sd/source/ui/inc/unomodel.hxx | 5
sd/source/ui/unoidl/unomodel.cxx | 32
sd/source/ui/view/sdwindow.cxx | 7
sd/source/ui/view/viewshel.cxx | 25
svx/README | 57 +
svx/source/svdraw/selectioncontroller.cxx | 3
svx/source/svdraw/svdedxv.cxx | 10
svx/source/svdraw/svdpntv.cxx | 3
svx/source/svdraw/svdview.cxx | 26
svx/source/table/tablecontroller.cxx | 28
sw/inc/unotxdoc.hxx | 2
sw/source/core/crsr/viscrs.cxx | 8
sw/source/uibase/docvw/edtwin.cxx | 19
sw/source/uibase/inc/edtwin.hxx | 4
sw/source/uibase/uno/unotxdoc.cxx | 25
vcl/source/window/paint.cxx | 9
118 files changed, 1792 insertions(+), 3076 deletions(-)
New commits:
commit 600781382c068212f312f9d9a3de4c903ba83766
Author: Siqi Liu <me at siqi.fr>
Date: Mon Apr 6 14:03:35 2015 +0200
implement strike out and .uno:Save
.uno:Save works out of box for when tested against documents (impress,
calc) loaded directly from dropbox for example. However, it doesn't work with
impress/calc documents loaded from local files. Writer documents won't
save, either locally or from network resources. More research needed.
Change-Id: Ibdcc209a71f14ec91ba9c1152b305e0278787713
diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
new file mode 100644
index 0000000..f7682ab
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png b/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
new file mode 100644
index 0000000..955f1cb
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
new file mode 100644
index 0000000..e9eccc8
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
new file mode 100644
index 0000000..0b2c39f
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png differ
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/experimental/LOAndroid3/res/menu/main.xml
index 979bbd1..09314f5 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/android/experimental/LOAndroid3/res/menu/main.xml
@@ -16,6 +16,12 @@
android:orderInCategory="100"
app:showAsAction="always"/>
+ <item android:id="@+id/action_strikeout"
+ android:title="@string/action_strikeout"
+ android:icon="@drawable/action_strikeout"
+ android:orderInCategory="100"
+ app:showAsAction="always"/>
+
<item android:id="@+id/action_underline"
android:title="@string/action_underline"
android:icon="@drawable/action_underline"
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml
index 0b9e7a2..ffce3d8 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -37,6 +37,7 @@
<string name="action_bold">Bold</string>
<string name="action_underline">Underline</string>
<string name="action_italic">Italic</string>
+ <string name="action_strikeout">Strike Out</string>
<string name="action_keyboard">Show keyboard</string>
<string name="action_save">Save</string>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 4664687..c831977 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -85,6 +85,9 @@ public class LibreOfficeMainActivity extends ActionBarActivity {
case R.id.action_underline:
LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Underline"));
return true;
+ case R.id.action_strikeout:
+ LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:StrikeOut"));
+ return true;
case R.id.action_keyboard:
showSoftKeyboard();
break;
@@ -92,7 +95,8 @@ public class LibreOfficeMainActivity extends ActionBarActivity {
mAbout.showAbout();
return true;
case R.id.action_save:
- Toast.makeText(this, "saving the document...", Toast.LENGTH_SHORT).show();
+ Toast.makeText(this, "Saving the document...", Toast.LENGTH_SHORT).show();
+ LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Save"));
return true;
case R.id.action_parts:
mDrawerLayout.openDrawer(mDrawerList);
commit 950d33871d5ac4f4ab73f515a89b9e1b9a0ff91c
Author: Siqi Liu <me at siqi.fr>
Date: Mon Apr 6 12:10:09 2015 +0200
add saving action placeholder
Change-Id: Ibb4595e297a4328f2bb108e1b9e71bb50843e3b9
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/experimental/LOAndroid3/res/menu/main.xml
index 1a1c22a..979bbd1 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/android/experimental/LOAndroid3/res/menu/main.xml
@@ -28,11 +28,15 @@
android:orderInCategory="100"
app:showAsAction="always"/>
- <item android:id="@+id/action_about"
- android:title="@string/action_about"
+ <item android:id="@+id/action_save"
+ android:title="@string/action_save"
android:orderInCategory="100" />
<item android:id="@+id/action_parts"
android:title="@string/action_parts"
android:orderInCategory="100" />
+
+ <item android:id="@+id/action_about"
+ android:title="@string/action_about"
+ android:orderInCategory="100" />
</menu>
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml
index 939804d..0b9e7a2 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -38,5 +38,6 @@
<string name="action_underline">Underline</string>
<string name="action_italic">Italic</string>
<string name="action_keyboard">Show keyboard</string>
+ <string name="action_save">Save</string>
</resources>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index ed87f8c..4664687 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -16,6 +16,7 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.ListView;
+import android.widget.Toast;
import org.libreoffice.overlay.TextCursorLayer;
import org.mozilla.gecko.ZoomConstraints;
@@ -90,6 +91,9 @@ public class LibreOfficeMainActivity extends ActionBarActivity {
case R.id.action_about:
mAbout.showAbout();
return true;
+ case R.id.action_save:
+ Toast.makeText(this, "saving the document...", Toast.LENGTH_SHORT).show();
+ return true;
case R.id.action_parts:
mDrawerLayout.openDrawer(mDrawerList);
return true;
commit 26afe0a3392060257ccfeaa92545c39fcab880f5
Author: Siqi Liu <me at siqi.fr>
Date: Mon Apr 6 11:58:49 2015 +0200
add italic/underline button with icons for different screen res
Change-Id: Ib158f32af7ef8d65d4ddd822839b260161a74343
diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png
new file mode 100644
index 0000000..950d615
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png
new file mode 100644
index 0000000..399bb9c
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png
new file mode 100644
index 0000000..09f8b20
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png b/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png
new file mode 100644
index 0000000..bc60968
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png b/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png
new file mode 100644
index 0000000..6394cf9
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png b/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png
new file mode 100644
index 0000000..3b6c7f6
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png
new file mode 100644
index 0000000..95c985e
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png
new file mode 100644
index 0000000..e4366f4
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png
new file mode 100644
index 0000000..421a750
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png
new file mode 100644
index 0000000..c5256f5
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png
new file mode 100644
index 0000000..a5e921f
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png
new file mode 100644
index 0000000..4cd7971
Binary files /dev/null and b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_bold_grey600_24dp.png b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_bold_grey600_24dp.png
deleted file mode 100644
index 2d7688a..0000000
Binary files a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_bold_grey600_24dp.png and /dev/null differ
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/experimental/LOAndroid3/res/menu/main.xml
index 8670ed3..1a1c22a 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/android/experimental/LOAndroid3/res/menu/main.xml
@@ -6,7 +6,19 @@
<item android:id="@+id/action_bold"
android:title="@string/action_bold"
- android:icon="@drawable/ic_format_bold_grey600_24dp"
+ android:icon="@drawable/action_bold"
+ android:orderInCategory="100"
+ app:showAsAction="always"/>
+
+ <item android:id="@+id/action_italic"
+ android:title="@string/action_italic"
+ android:icon="@drawable/action_italic"
+ android:orderInCategory="100"
+ app:showAsAction="always"/>
+
+ <item android:id="@+id/action_underline"
+ android:title="@string/action_underline"
+ android:icon="@drawable/action_underline"
android:orderInCategory="100"
app:showAsAction="always"/>
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml
index 3d8c3aa..939804d 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -35,6 +35,8 @@
<string name="local_documents">Local documents</string>
<string name="local_file_system">Local file system</string>
<string name="action_bold">Bold</string>
+ <string name="action_underline">Underline</string>
+ <string name="action_italic">Italic</string>
<string name="action_keyboard">Show keyboard</string>
</resources>
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 3aaa2b2..ed87f8c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -78,6 +78,12 @@ public class LibreOfficeMainActivity extends ActionBarActivity {
case R.id.action_bold:
LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Bold"));
return true;
+ case R.id.action_italic:
+ LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Italic"));
+ return true;
+ case R.id.action_underline:
+ LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Underline"));
+ return true;
case R.id.action_keyboard:
showSoftKeyboard();
break;
commit fa9b324f8eff93e05bd9ba3813b93e1bdc35aa30
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 3 23:51:21 2015 +0200
sc tiled editing: Don't crash on desktop.
Change-Id: I4cb63550b3913d097db63b374f0acbea591682e4
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index be017e3..925f473 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -243,7 +243,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce )
// work in the logic coordinates (ideally 100ths of mm - so that it is
// the same as editeng and drawinglayer), and get rid of all the
// SetMapMode's and other unneccessary fun we have with pixels
- if (pDoc->GetDrawLayer()->isTiledRendering())
+ if (pDoc && pDoc->GetDrawLayer() && pDoc->GetDrawLayer()->isTiledRendering())
{
return pViewData->GetLogicMode();
}
commit 626e15b6175d24ec68e519836e6438d5f8bf14d0
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 3 23:22:56 2015 +0200
sc tiled editing: Fix the conversion so that it works with zoom too.
Change-Id: I80d9ed6abe6b3ddb2bb1e0d6b7c74ce50d0df55a
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 43cd9df..07a79c6 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -480,9 +480,8 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
//if (pGridWindow->GetOutputSizePixel() != aTileSize)
// pGridWindow->SetOutputSizePixel(Size(nOutputWidth, nOutputHeight));
// so instead for now, set the viewport size to document size
- const MapMode aMapTwip(MAP_TWIP);
Size aDocSize = getDocumentSize();
- pGridWindow->SetOutputSizePixel(pGridWindow->LogicToPixel(aDocSize, aMapTwip));
+ pGridWindow->SetOutputSizePixel(Size(aDocSize.Width() * pViewData->GetPPTX(), aDocSize.Height() * pViewData->GetPPTY()));
pGridWindow->PaintTile( rDevice, nOutputWidth, nOutputHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight );
commit cc3d6c217b59969c8b163f4d7aae0f524b58fead
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 3 23:07:31 2015 +0200
Revert "sc tiled editing: This got fixed by the recent changes."
Needed again.
This reverts commit b11c58889cde10f43a9f239a959eb2c252dc4db7.
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a9c0135..269d12e 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -893,7 +893,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
// set the correct mapmode
Rectangle aBackground(aStart, aEnd);
if (bIsTiledRendering)
+ {
+ aBackground += Point(nScrX, nScrY);
rDevice.SetMapMode(aDrawMode);
+ }
else
rDevice.SetMapMode(pViewData->GetLogicMode());
commit 577eb5098363417eb87b25ed75007c5fe9857a2d
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 3 23:04:06 2015 +0200
sc tiled editing: For now, revert to using the entire doc size.
There are still too many problems with the interaction with the editeng,
unfortunately.
Change-Id: I5cdbc80dbe1dc3996ecd89f0bca5399cbfb9c9b0
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 8e4c656..43cd9df 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -473,9 +473,16 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
ScGridWindow* pGridWindow = pViewData->GetActiveWin();
// update the size of the area we are painting
- Size aTileSize(nOutputWidth, nOutputHeight);
- if (pGridWindow->GetOutputSizePixel() != aTileSize)
- pGridWindow->SetOutputSizePixel(Size(nOutputWidth, nOutputHeight));
+ // FIXME we want to use only the minimal necessary size, like the
+ // following; but for the moment there is too many problems with that and
+ // interaction with editeng used for the cell editing
+ //Size aTileSize(nOutputWidth, nOutputHeight);
+ //if (pGridWindow->GetOutputSizePixel() != aTileSize)
+ // pGridWindow->SetOutputSizePixel(Size(nOutputWidth, nOutputHeight));
+ // so instead for now, set the viewport size to document size
+ const MapMode aMapTwip(MAP_TWIP);
+ Size aDocSize = getDocumentSize();
+ pGridWindow->SetOutputSizePixel(pGridWindow->LogicToPixel(aDocSize, aMapTwip));
pGridWindow->PaintTile( rDevice, nOutputWidth, nOutputHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight );
commit ac662ccdeed798d3632bf0c444231f4c9c94c2cd
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 3 20:57:49 2015 +0200
sc tiled editing: Correct position of the selection in far positions.
Before this commit, the selections outside of the aScrSize rectangle did not
work - they always degraded to a single cell selection.
Change-Id: Ie51da710424bff3691302f5923b141a2f2bea676
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7202f3d..a9c0135 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1554,23 +1554,35 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
SCCOL nPosX = pViewData->GetPosX( eHWhich );
SCROW nPosY = pViewData->GetPosY( eVWhich );
+ // is the selection visible at all?
if (nTestX2 < nPosX || nTestY2 < nPosY)
- return; // unsichtbar
+ return;
SCCOL nRealX1 = nX1;
if (nX1 < nPosX)
nX1 = nPosX;
if (nY1 < nPosY)
nY1 = nPosY;
- SCCOL nXRight = nPosX + pViewData->VisibleCellsX(eHWhich);
- if (nXRight > MAXCOL) nXRight = MAXCOL;
- SCROW nYBottom = nPosY + pViewData->VisibleCellsY(eVWhich);
- if (nYBottom > MAXROW) nYBottom = MAXROW;
-
- if (nX1 > nXRight || nY1 > nYBottom)
- return; // unsichtbar
- if (nX2 > nXRight) nX2 = nXRight;
- if (nY2 > nYBottom) nY2 = nYBottom;
+ if (!pDoc->GetDrawLayer()->isTiledRendering())
+ {
+ // limit the selection to only what is visible on the screen
+ SCCOL nXRight = nPosX + pViewData->VisibleCellsX(eHWhich);
+ if (nXRight > MAXCOL)
+ nXRight = MAXCOL;
+
+ SCROW nYBottom = nPosY + pViewData->VisibleCellsY(eVWhich);
+ if (nYBottom > MAXROW)
+ nYBottom = MAXROW;
+
+ // is the selection visible at all?
+ if (nX1 > nXRight || nY1 > nYBottom)
+ return;
+
+ if (nX2 > nXRight)
+ nX2 = nXRight;
+ if (nY2 > nYBottom)
+ nY2 = nYBottom;
+ }
double nPPTX = pViewData->GetPPTX();
double nPPTY = pViewData->GetPPTY();
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 32ed642..fb375a5 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1513,13 +1513,14 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
}
sal_uInt16 nTSize;
+ bool bIsTiledRendering = GetDocument()->GetDrawLayer()->isTiledRendering();
SCCOL nPosX = GetPosX(eWhichX);
SCCOL nX;
long nScrPosX=0;
if (nWhereX >= nPosX)
- for (nX=nPosX; nX<nWhereX && (bAllowNeg || nScrPosX<=aScrSize.Width()); nX++)
+ for (nX = nPosX; nX < nWhereX && (bAllowNeg || bIsTiledRendering || nScrPosX <= aScrSize.Width()); nX++)
{
if ( nX > MAXCOL )
nScrPosX = 65535;
@@ -1550,7 +1551,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
long nScrPosY=0;
if (nWhereY >= nPosY)
- for (nY=nPosY; nY<nWhereY && (bAllowNeg || nScrPosY<=aScrSize.Height()); nY++)
+ for (nY = nPosY; nY < nWhereY && (bAllowNeg || bIsTiledRendering || nScrPosY <= aScrSize.Height()); nY++)
{
if ( nY > MAXROW )
nScrPosY = 65535;
@@ -1591,8 +1592,14 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
nScrPosX = aScrSize.Width() - 1 - nScrPosX;
}
- if (nScrPosX > 32767) nScrPosX=32767;
- if (nScrPosY > 32767) nScrPosY=32767;
+ if (!bIsTiledRendering)
+ {
+ if (nScrPosX > 32767)
+ nScrPosX = 32767;
+ if (nScrPosY > 32767)
+ nScrPosY = 32767;
+ }
+
return Point( nScrPosX, nScrPosY );
}
commit ee1e0919c29bca99405c9c3b1f250b69ec069fd0
Author: Henry Castro <hcastro at collabora.com>
Date: Fri Apr 3 16:29:24 2015 -0400
sc tiled editing: Changed behaviour double click to click.
In the tiled rendering case, it points the cell cursor, and immediately
start the editing.
When it is double click, it will only trigger the selection of the cell.
Change-Id: Iafcabba408533e8162bd45d780f5e8926c6970bb
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 8d825c4..d7d56e0 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1837,6 +1837,17 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta
// TestMouse schon oben passiert
}
+ // In the tiled rendering case, select shapes
+ if (rMEvt.IsLeft() && pViewData->GetDocument()->GetDrawLayer()->isTiledRendering())
+ {
+ if ( !bCrossPointer && DrawMouseButtonDown(rMEvt) )
+ {
+ return;
+ }
+
+ pViewData->GetViewShell()->SetDrawShell( false );
+ }
+
Point aPos = rMEvt.GetPosPixel();
SCsCOL nPosX;
SCsROW nPosY;
@@ -1916,6 +1927,10 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta
}
else
nMouseStatus = SC_GM_TABDOWN;
+
+ // In the tiled rendering case, fake mouse status to double click
+ if ( nMouseStatus == SC_GM_TABDOWN && pDoc->GetDrawLayer()->isTiledRendering() )
+ nMouseStatus = SC_GM_DBLDOWN;
}
// Links in Edit-Zellen
@@ -2200,9 +2215,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
pView->ResetBrushDocument(); // invalidates pBrushDoc pointer
}
- // double click (only left button)
-
- bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
+ // In the tiled rendering case, change double click to single click (only left button)
+ bool bDouble = ( pDoc->GetDrawLayer()->isTiledRendering() && rMEvt.IsLeft() ) || ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() )
{
// data pilot table
@@ -2751,7 +2765,10 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier() );
- MouseButtonUp( aUpEvt );
+
+ // In the tiled rendering case, do not spawn fake mouse up
+ if (!pViewData->GetDocument()->GetDrawLayer()->isTiledRendering())
+ MouseButtonUp( aUpEvt );
}
else
MouseMove( rMEvt );
commit 7bc83da3d6d1863d86c43db81ed9115e93689510
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 3 17:41:49 2015 +0200
android: update startup details of README
Change-Id: I88a0483e96f2de38ae3c1bc6f707e3b5b504bbac
diff --git a/android/README b/android/README
index c0a7e93..48c3d6e 100644
--- a/android/README
+++ b/android/README
@@ -249,30 +249,12 @@ lo_dlneeds: Could not read ELF header of /data/data/org.libreoffice...libfoo.so
This (most likely) means that the install quietly failed, and that
the file is truncated; check it out with adb shell ls -l /data/data/....
-* Detailed explanation
-
-Note: the below talk about unit tests is obsolete; we no longer have
-any makefilery etc to build unit tests for Android.
-
-Unit tests are the first thing we want to run on Android, to get some
-idea how well, if at all, the basic LO libraries work. We want to
-build even unit tests as normal Android apps, i.e. packaged as .apk
-files, so that they run in a sandboxed environment like that of
-whatever eventual end-user Android apps there will be that use LO
-code.
-
-Sure, we could quite easily build unit tests as plain Linux
-executables (built against the Android libraries, of course, not
-GNU/Linux ones), push them to the device or emulator with adb and run
-them from adb shell, but that would not be a good test as the
-environment such processs run in is completely different from that in
-which real end-user apps with GUI etc run. We have no intent to
-require LibreOffice code to be used only on "rooted" devices etc.
+* Startup details
All Android apps are basically Java programs. They run "in" a Dalvik
(or on Android 5 or newer - ART) virtual machine. Yes, you can also
have apps where all *your* code is native code, written in a compiled
-language like C or C++. But also also such apps are actually started
+language like C or C++. But also such apps are actually started
by system-provided Java bootstrapping code (NativeActivity) running
in a Dalvik VM.
commit 3f82a2e72f53d76dcb6a4c44da9dd65fd3d4b931
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 3 17:37:21 2015 +0200
android: remove dead GSoC-2012-eclipse-workspace
Change-Id: I62e551b99904036e8c0e67f0684dc16e5ade2b90
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.classpath b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.classpath
deleted file mode 100644
index a4763d1..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.project b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.project
deleted file mode 100644
index f3a4c44..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>LibreOfficeUI</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.settings/org.eclipse.jdt.core.prefs b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 416f4fb..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/AndroidManifest.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/AndroidManifest.xml
deleted file mode 100644
index fa1724a..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.libreoffice.ui"
- android:versionCode="1"
- android:versionName="1.0" >
-
- <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="11"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
- <application
- android:icon="@drawable/lo_icon"
- android:label="@string/app_name" android:theme="@android:style/Theme.Holo.Light">
- <activity
- android:name=".LibreOfficeUIActivity"
- android:label="@string/app_name" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- <activity android:theme="@android:style/Theme.Holo.Light" android:name="WriterViewerActivity">
- <intent-filter android:label="writer_viewer"></intent-filter>
- </activity>
- <activity android:name="PreferenceEditor"></activity>
- </application>
-
-</manifest>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/proguard.cfg b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/proguard.cfg
deleted file mode 100644
index b1cdf17..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/proguard.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
- native <methods>;
-}
-
--keepclasseswithmembers class * {
- public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
- public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
- public void *(android.view.View);
-}
-
--keepclassmembers enum * {
- public static **[] values();
- public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
- public static final android.os.Parcelable$Creator *;
-}
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/project.properties b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/project.properties
deleted file mode 100644
index d79abae..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-11
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/action_search.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/action_search.png
deleted file mode 100644
index e6b7045..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/action_search.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/base.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/base.png
deleted file mode 100644
index 729dbcd..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/base.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/calc.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/calc.png
deleted file mode 100644
index a3f5fd4..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/calc.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/draw.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/draw.png
deleted file mode 100644
index b3ee114..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/draw.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/dummy_page.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/dummy_page.png
deleted file mode 100644
index c58d276..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/dummy_page.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/folder.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/folder.png
deleted file mode 100644
index 9c9b42c..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/folder.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/ic_launcher.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 8074c4c..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/impress.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/impress.png
deleted file mode 100644
index 5909f05..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/impress.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_sort_by_size.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_sort_by_size.png
deleted file mode 100644
index 3b34aaf..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_sort_by_size.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_view_as_grid.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_view_as_grid.png
deleted file mode 100644
index ae138ed..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_view_as_grid.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_view_as_list.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_view_as_list.png
deleted file mode 100644
index c5f6c97..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/light_view_as_list.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/lo_icon.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/lo_icon.png
deleted file mode 100644
index 2ef8641..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/lo_icon.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/main.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/main.png
deleted file mode 100644
index 7e8e2a0..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/main.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/math.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/math.png
deleted file mode 100644
index 50b8dc8..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/math.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/startcenter.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/startcenter.png
deleted file mode 100644
index 7e8e2a0..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/startcenter.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/writer.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/writer.png
deleted file mode 100644
index 2f4abcb..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-hdpi/writer.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/dummy_page.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/dummy_page.png
deleted file mode 100644
index c58d276..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/dummy_page.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/ic_launcher.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 1095584..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/lo_icon.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/lo_icon.png
deleted file mode 100644
index 95b3113..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-ldpi/lo_icon.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-mdpi/ic_launcher.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index a07c69f..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-mdpi/lo_icon.png b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-mdpi/lo_icon.png
deleted file mode 100644
index 4f3f89b..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/drawable-mdpi/lo_icon.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_explorer_grid_item.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_explorer_grid_item.xml
deleted file mode 100644
index ce42e57..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_explorer_grid_item.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/grid_item_image"
- android:layout_width="50dp"
- android:layout_height="75dp"
- android:paddingTop="15dp"
- android:paddingBottom="10dp"
- android:layout_gravity="center" >
- </ImageView>
-
- <TextView
- android:id="@+id/grid_item_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@+id/label"
- android:paddingLeft="10dp"
- android:paddingRight="10dp"
- android:layout_gravity="center"
- android:textSize="15dp"
- android:textStyle="bold"
- android:maxLines="2">
- </TextView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_grid.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_grid.xml
deleted file mode 100644
index 1e241c00..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_grid.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <GridView
- android:id="@+id/file_explorer_grid_view"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:columnWidth="120dp"
- android:numColumns="auto_fit"
- android:verticalSpacing="10dp"
- android:horizontalSpacing="10dp"
- android:stretchMode="columnWidth"
- android:gravity="center">
- </GridView>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list.xml
deleted file mode 100644
index 6ef0255..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <ListView
- android:id="@+id/file_explorer_list_view"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- ></ListView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list_item.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list_item.xml
deleted file mode 100644
index 0bff445..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/file_list_item.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:orientation="horizontal" >
- <ImageView
- android:id="@+id/file_list_item_icon"
- android:layout_height="match_parent"
- android:layout_width="32dp"
- android:layout_margin="8dp"
- android:layout_gravity="center"/>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:orientation="horizontal">
- <TextView
- android:id="@+id/file_list_item_name"
- android:layout_height="48dp"
- android:layout_width="0dp"
- android:textSize="15dp"
- android:textStyle="bold"
- android:layout_weight="2"
- android:gravity="center"/>
- <TextView
- android:id="@+id/file_list_item_size"
- android:layout_height="48dp"
- android:layout_width="0dp"
- android:textSize="15dp"
- android:textStyle="bold"
- android:layout_weight="1"
- android:gravity="center"/>
- <TextView
- android:id="@+id/file_list_item_date"
- android:layout_height="48dp"
- android:layout_width="0dp"
- android:textSize="15dp"
- android:textStyle="bold"
- android:layout_weight="2"
- android:gravity="center"/>
- </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/main.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/main.xml
deleted file mode 100644
index 6b97fe1..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/layout/main.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="#aaa"
- android:orientation="vertical"
- >
-
- <org.libreoffice.ui.PageView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- />
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/menu/view_menu.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/menu/view_menu.xml
deleted file mode 100644
index 87270d3..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/menu/view_menu.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_search"
- android:icon="@drawable/action_search"
- android:showAsAction="always" />
- <item android:id="@+id/menu_view_toggle"
- android:title="@string/grid_view"/>
- <item android:id="@+id/menu_sort_size"
- android:title="@string/menu_sort_size"
- android:onClick="sortFiles"/>
- <item android:id="@+id/menu_sort_az"
- android:title="@string/menu_sort_az"
- android:onClick="sortFiles"/>
- <item android:id="@+id/menu_sort_modified"
- android:title="@string/menu_sort_modified"
- android:onClick="sortFiles"/>
- <item android:id="@+id/menu_preferences"
- android:title="@string/menu_preferences"
- android:onClick="editPreferences"/>
-</menu>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/arrays.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/arrays.xml
deleted file mode 100644
index 67a157d..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/arrays.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <integer-array name="FilterTypeValues">
- <item >-1</item>
- <item >0</item>
- <item >1</item>
- <item >2</item>
- </integer-array>
- <string-array name="FilterTypeStringValues">
- <item >-1</item>
- <item >0</item>
- <item >1</item>
- <item >2</item>
- </string-array>
- <string-array name="SortModeStringValues">
- <item >0</item>
- <item >1</item>
- <item >2</item>
- <item >3</item>
- <item >4</item>
- <item >5</item>
- </string-array>
- <!-- View Mode names,values -->
- <string-array name="ViewModeNames">
- <item >Grid</item>
- <item >List</item>
- </string-array>
- <string-array name="ViewModeStringValues">
- <item >0</item>
- <item >1</item>
- </string-array>
-
- <!-- Preference Name Arrays -->
- <string-array name="file_view_modes">
- <item >EVERYTHING</item>
- <item >DOCUMENTS</item>
- <item >SPREADSHEETS</item>
- <item >PRESENTATIONS</item>
- </string-array>
- <string-array name="FilterTypeNames">
- <item >Everything</item>
- <item >Documents</item>
- <item >Spreadsheets</item>
- <item >Presentations</item>
- </string-array>
- <string-array name="SortModeNames">
- <item >A-Z</item>
- <item >Z-A</item>
- <item >Oldest First</item>
- <item >Newest First</item>
- <item >Largest First</item>
- <item >Smallest First</item>
- </string-array>
-
-
-</resources>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/strings.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/strings.xml
deleted file mode 100644
index 8951dd4..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/values/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_name">LibreOfficeUI</string>
- <string name="menu_search">Search</string>
- <string name="list_view">List</string>
- <string name="grid_view">Grid</string>
- <string name="menu_sort_size">Sort By Size</string>
- <string name="menu_sort_az">Sort A-Z</string>
- <string name="menu_sort_modified">Sort by Date</string>
- <string name="menu_preferences">Preferences</string>
- <!-- Pref keys as resources ; Not currently used -->
- <string name="EXPLORER_VIEW_TYPE_KEY">EXPLORER_VIEW_TYPE</string>
- <string name="CURRENT_DIRECTORY_KEY">CURRENT_DIRECTORY</string>
-
-
-</resources>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/xml/libreoffice_preferences.xml b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/xml/libreoffice_preferences.xml
deleted file mode 100644
index d19d9e6..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/res/xml/libreoffice_preferences.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
- <ListPreference
- android:title="Default File Filter"
- android:summary="Set which files to show by default"
- android:entries="@array/FilterTypeNames"
- android:entryValues="@array/FilterTypeStringValues"
- android:key="FILTER_MODE"/>
- <ListPreference
- android:summary="Select how to order files; A-Z, by size, etc."
- android:key="SORT_MODE"
- android:title="File Order" android:entries="@array/SortModeNames" android:entryValues="@array/SortModeStringValues"/>
- <ListPreference
- android:entries="@array/ViewModeNames"
- android:entryValues="@array/ViewModeStringValues"
- android:title="Default File Explorer View"
- android:key="EXPLORER_VIEW_TYPE"
- android:summary="View files as a grid or in a list. #not functional, yet."/>
-
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/FileUtilities.java b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/FileUtilities.java
deleted file mode 100644
index 2e21dbe..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/FileUtilities.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.libreoffice.ui;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.util.Arrays;
-import java.util.Comparator;
-
-public class FileUtilities {
-
- static final int ALL = -1;
- static final int DOC = 0;
- static final int CALC = 1;
- static final int IMPRESS = 2;
-
- static final int SORT_AZ = 0;
- static final int SORT_ZA = 1;
- /** Oldest Files First*/
- static final int SORT_OLDEST = 2;
- /** Newest Files First*/
- static final int SORT_NEWEST = 3;
- /** Largest Files First */
- static final int SORT_LARGEST = 4;
- /** Smallest Files First */
- static final int SORT_SMALLEST = 5;
-
- private static String[] fileExtensions = {".odt",".ods",".odp"};
-
- static boolean isDoc(String filename){
- if( filename.endsWith( fileExtensions[ DOC ] ) ){
- return true;
- }
- return false;
- }
-
- static boolean isCalc(String filename){
- if( filename.endsWith( fileExtensions[ CALC ] ) ){
- return true;
- }
- return false;
- }
-
- static boolean isImpress(String filename){
- if( filename.endsWith( fileExtensions[ IMPRESS ] ) ){
- return true;
- }
- return false;
- }
-
- static FileFilter getFileFilter(int mode ){
- if( mode != ALL){
- final String ext = fileExtensions[ mode ];
- return new FileFilter() {
-
- public boolean accept(File pathname) {
- if( pathname.getName().endsWith( ext ) ){
- return true;
- }
- if( pathname.isDirectory() ){
- return true;
- }
- return false;
- }
- };
- }else{//return all
- return new FileFilter() {
-
- public boolean accept(File pathname) {
- // TODO Auto-generated method stub
- return true;
- }
- };
- }
- }
-
- static FilenameFilter getFilenameFilter(int mode){
- if( mode != ALL){
- final String ext = fileExtensions[ mode ];
- return new FilenameFilter() {
-
- public boolean accept(File dir, String filename) {
- if( filename.endsWith( ext ) ){
- return true;
- }
- if( new File( dir , filename ).isDirectory() ){
- return true;
- }
- return false;
- }
- };
- }else{
- return new FilenameFilter() {
-
- public boolean accept(File dir, String filename) {
- return true;
- }
- };
- }
- }
-
- static void sortFiles(File[] files , int sortMode){
- //Should really change all this to a switch statement...
- if( sortMode == SORT_AZ ){
- Arrays.sort( files , new Comparator<File>() {
-
- public int compare(File lhs, File rhs) {
- return lhs.getName().compareTo( rhs.getName() );
- }
- });
- return;
- }
- if( sortMode == SORT_ZA ){
- Arrays.sort( files , new Comparator<File>() {
-
- public int compare(File lhs, File rhs) {
- return rhs.getName().compareTo( lhs.getName() );
- }
- });
- return;
- }
- if( sortMode == SORT_OLDEST ){
- Arrays.sort( files , new Comparator<File>() {
-
- public int compare(File lhs, File rhs) {
- return Long.valueOf( lhs.lastModified() ).compareTo( rhs.lastModified() );
- }
- });
- return;
- }
- if( sortMode == SORT_NEWEST ){
- Arrays.sort( files , new Comparator<File>() {
-
- public int compare(File lhs, File rhs) {
- return Long.valueOf( rhs.lastModified() ).compareTo( lhs.lastModified() );
- }
- });
- return;
- }
- if( sortMode == SORT_LARGEST ){
- Arrays.sort( files , new Comparator<File>() {
-
- public int compare(File lhs, File rhs) {
- return Long.valueOf( rhs.length() ).compareTo( lhs.length() );
- }
- });
- return;
- }
- if( sortMode == SORT_SMALLEST ){
- Arrays.sort( files , new Comparator<File>() {
-
- public int compare(File lhs, File rhs) {
- return Long.valueOf( lhs.length() ).compareTo( rhs.length() );
- }
- });
- return;
- }
- return;
- }
-}
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/GridItemAdapter.java b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/GridItemAdapter.java
deleted file mode 100644
index 9585705..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/GridItemAdapter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.libreoffice.ui;
-
-import java.io.File;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class GridItemAdapter extends BaseAdapter{
- Context mContext;
- File[] filePaths;
- File currentDirectory;
- String tag = "GridItemAdapter";
-
- public GridItemAdapter(Context mContext, File[] filePaths) {
- this.mContext = mContext;
- this.filePaths = filePaths;
- for(File fn : filePaths){
- Log.d(tag, fn.getName());
- }
- }
-
- public GridItemAdapter(Context mContext, File currentDirectory) {
- this.mContext = mContext;
- this.currentDirectory = currentDirectory;
- filePaths = currentDirectory.listFiles();
- }
-
- public GridItemAdapter(Context mContext, File currentDirectory, File[] filteredFiles) {
- this.mContext = mContext;
- this.currentDirectory = currentDirectory;
- filePaths = filteredFiles;
- }
-
- public int getCount() {
- return filePaths.length;
- }
-
- public Object getItem(int position) {
- return null;//filePaths[ position ];
- }
-
- public long getItemId(int arg0) {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public View getView(int position, View convertView, ViewGroup parent) {
- LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
- Context.LAYOUT_INFLATER_SERVICE);
-
- View gridView;
-
- if (convertView == null) {
-
-
-
- } else {
- gridView = (View) convertView;
- }
- gridView = new View(mContext);
-
- // get layout from mobile.xml
- gridView = inflater.inflate(R.layout.file_explorer_grid_item, null);
-
- // set value into textview
- TextView textView = (TextView) gridView
- .findViewById(R.id.grid_item_label);
- textView.setText(filePaths[position].getName());
- // set image based on selected text
- ImageView imageView = (ImageView) gridView
- .findViewById(R.id.grid_item_image);
- if( filePaths[position].getName().endsWith(".odt") ){
- imageView.setImageResource(R.drawable.writer);
- }
- if( filePaths[position].getName().endsWith(".ods") ){
- imageView.setImageResource(R.drawable.calc);
- }
- if( filePaths[position].getName().endsWith(".odp") ){
- imageView.setImageResource(R.drawable.impress);
- }
- if( filePaths[position].isDirectory() ){//Is a folder
- //Eventually have thumbnails of each sub file on a black circle
- //For now just a folder icon
- imageView.setImageResource(R.drawable.folder);
- }
- return gridView;
- }
-
-}
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/LibreOfficeUIActivity.java
deleted file mode 100644
index d1e46a9..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ /dev/null
@@ -1,548 +0,0 @@
-package org.libreoffice.ui;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.prefs.Preferences;
-
-import android.app.ActionBar;
-import android.app.ActionBar.OnNavigationListener;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.DataSetObserver;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-public class LibreOfficeUIActivity extends Activity implements OnNavigationListener {
- private String tag = "file_manager";
- private SharedPreferences prefs;
- private File homeDirectory;
- private File currentDirectory;
- private int filterMode = FileUtilities.ALL;
- private int viewMode;
- private int sortMode;
-
- FileFilter fileFilter;
- FilenameFilter filenameFilter;
- private String[] fileNames;
- private File[] filePaths;
-
-
- private static final String CURRENT_DIRECTORY_KEY = "CURRENT_DIRECTORY";
- private static final String FILTER_MODE_KEY = "FILTER_MODE";
- public static final String EXPLORER_VIEW_TYPE_KEY = "EXPLORER_VIEW_TYPE";
- public static final String EXPLORER_PREFS_KEY = "EXPLORER_PREFS";
- public static final String SORT_MODE_KEY = "SORT_MODE";
-
- public static final int GRID_VIEW = 0;
- public static final int LIST_VIEW = 1;
-
- GridView gv;
- ListView lv;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
-
- super.onCreate(savedInstanceState);
- Log.d(tag, "onCreate");
- //Set the "home" - top level - directory.
- homeDirectory = new File(Environment.getExternalStorageDirectory(),"LibreOffice");
- homeDirectory.mkdirs();
- currentDirectory = homeDirectory;
- //Load default settings
-
-
- }
-
- public void createUI(){
- ActionBar actionBar = getActionBar();
- actionBar.setDisplayShowTitleEnabled(false);//This should show current directory if anything
- actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
- SpinnerAdapter mSpinnerAdapter = ArrayAdapter.createFromResource(this, R.array.file_view_modes,
- android.R.layout.simple_spinner_dropdown_item);
- actionBar.setListNavigationCallbacks(mSpinnerAdapter, this);
- if( !currentDirectory.equals( homeDirectory )){
- actionBar.setDisplayHomeAsUpEnabled(true);
- }
-
- if( viewMode == GRID_VIEW){
- // code to make a grid view
- setContentView(R.layout.file_grid);
- gv = (GridView)findViewById(R.id.file_explorer_grid_view);
- fileNames = currentDirectory.list( FileUtilities.getFilenameFilter( filterMode ) );
- filePaths = currentDirectory.listFiles( FileUtilities.getFileFilter( filterMode ) );
- gv.setOnItemClickListener(new OnItemClickListener() {
- public void onItemClick(AdapterView<?> parent, View view,
- int position, long id) {
- File file = filePaths[position];
- if(!file.isDirectory()){
- open(fileNames[position]);
- }else{
- file = new File( currentDirectory, file.getName() );
- openDirectory( file );
- }
-
- }
- });
- gv.setAdapter( new GridItemAdapter(getApplicationContext(), currentDirectory, filePaths ) );
- actionBar.setSelectedNavigationItem( filterMode + 1 );//This triggers the listener which modifies the view.
- }else{
- setContentView(R.layout.file_list);
- lv = (ListView)findViewById( R.id.file_explorer_list_view);
- lv.setClickable(true);
- fileNames = currentDirectory.list( FileUtilities.getFilenameFilter( filterMode ) );
- filePaths = currentDirectory.listFiles( FileUtilities.getFileFilter( filterMode ) );
- /*lv.setOnItemClickListener(new OnItemClickListener() {
- public void onItemClick(AdapterView<?> parent, View view,
- int position, long id) {
- Log.d(tag, "click!");
- File file = filePaths[position];
- if(!file.isDirectory()){
- open(fileNames[position]);
- }else{
- file = new File( currentDirectory, file.getName() );
- openDirectory( file );
- }
- }
- });*/
- lv.setAdapter( new ListItemAdapter(getApplicationContext(), filePaths) );
- actionBar.setSelectedNavigationItem( filterMode + 1 );
- }
-
- }
-
- public void openDirectory(File dir ){
- currentDirectory = dir;
- if( !currentDirectory.equals( homeDirectory )){
- ActionBar actionBar = getActionBar();
- actionBar.setDisplayHomeAsUpEnabled(true);
- }else{
- ActionBar actionBar = getActionBar();
- actionBar.setDisplayHomeAsUpEnabled( false );
- }
- filePaths = currentDirectory.listFiles( FileUtilities.getFileFilter( filterMode ) );
- fileNames = new String[ filePaths.length ];
- FileUtilities.sortFiles( filePaths, sortMode );
- for( int i = 0; i < fileNames.length; i++){
- fileNames[ i ] = filePaths[ i ].getName();
- }
- if( viewMode == GRID_VIEW){
- gv.setAdapter( new GridItemAdapter(getApplicationContext(), currentDirectory, filePaths ) );
- }else{
- lv.setAdapter( new ListItemAdapter(getApplicationContext(), filePaths) );
- }
- }
-
- 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 );
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.view_menu, menu);
-
- MenuItem item = (MenuItem)menu.findItem(R.id.menu_view_toggle);
- if( viewMode == GRID_VIEW){
- item.setTitle(R.string.list_view);
- item.setIcon( R.drawable.light_view_as_list );
- }else{
- item.setTitle(R.string.grid_view);
- item.setIcon( R.drawable.light_view_as_grid );
- }
- return true;
- }
-
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- if( !currentDirectory.equals( homeDirectory ) ){
- openDirectory( currentDirectory.getParentFile() );
- }
- break;
- case R.id.menu_view_toggle:
- if( viewMode == GRID_VIEW){
- viewMode = LIST_VIEW;
- item.setTitle(R.string.grid_view);//Button points to next view.
- item.setIcon( R.drawable.light_view_as_grid );
-
- }else{
- viewMode = GRID_VIEW;
- item.setTitle(R.string.list_view);//Button points to next view.
- item.setIcon( R.drawable.light_view_as_list );
- }
- createUI();
- break;
- default:
- return super.onOptionsItemSelected(item);
- }
- return true;
- }
-
- public void createDummyFileSystem(){
- boolean mExternalStorageAvailable = false;
- boolean mExternalStorageWriteable = false;
- String state = Environment.getExternalStorageState();
-
- if (Environment.MEDIA_MOUNTED.equals(state)) {
- mExternalStorageAvailable = mExternalStorageWriteable = true;
- } else if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
- mExternalStorageAvailable = true;
- mExternalStorageWriteable = false;
- } else {
- mExternalStorageAvailable = mExternalStorageWriteable = false;
- }
- if( mExternalStorageAvailable && mExternalStorageWriteable ){//can also check if its writeable
- Log.d(tag, Boolean.toString( currentDirectory.mkdir() ) );
- try {
- File[] removeList = currentDirectory.listFiles();
- for(File item : removeList){
- if(item.isDirectory())
- continue;//Log.d(tag, item.getPath());
- item.delete();
- }
- new File( currentDirectory , "d0.odp" ).createNewFile();
- new File( currentDirectory , "d1.odt" ).createNewFile();
- new File( currentDirectory , "d2.odt" ).createNewFile();
- new File( currentDirectory , "d3.odp" ).createNewFile();
- new File( currentDirectory , "d4.ods" ).createNewFile();
- new File( currentDirectory , "d5.odt" ).createNewFile();
- new File( currentDirectory , "d6.odp" ).createNewFile();
- new File( currentDirectory , "d7.odt" ).createNewFile();
- new File( currentDirectory , "d8.odt" ).createNewFile();
- new File( currentDirectory , "d9.odp" ).createNewFile();
- new File( currentDirectory , "d10.odp" ).createNewFile();
- new File( currentDirectory , "d11.odt" ).createNewFile();
- new File( currentDirectory , "d12.odt" ).createNewFile();
- new File( currentDirectory , "d13.odp" ).createNewFile();
- new File( currentDirectory , "d14.ods" ).createNewFile();
- new File( currentDirectory , "d15.odt" ).createNewFile();
- File templatesDirectory = new File( currentDirectory , "Templates" );
- templatesDirectory.mkdir();
- new File( templatesDirectory , "template1.odt" ).createNewFile();
- new File( templatesDirectory , "template2.odt" ).createNewFile();
- new File( templatesDirectory , "template3.ods" ).createNewFile();
- new File( templatesDirectory , "template4.odp" ).createNewFile();
- File regularDirectory = new File( currentDirectory , "Folder" );
- regularDirectory.mkdir();
- new File( regularDirectory , "yetAnotherDoc.odt" ).createNewFile();
- new File( regularDirectory , "some really long file name.ods" ).createNewFile();
- File anotherRegularDirectory = new File( regularDirectory , "AnotherFolder" );
- anotherRegularDirectory.mkdir();
- new File( anotherRegularDirectory , "yetAnotherDoc2.odt" ).createNewFile();
- //Should put a folder in at some stage.
-
- } catch (IOException e) {
- Log.d(tag, "file io failure");
- e.printStackTrace();
- }
- //Log.d(tag, fileStore.toString());
- }
- else{
- Log.d(tag, "No External Storage");
- }
- }
-
- @SuppressWarnings("unused")//see android:onClick properties in view_menu.xml
- public void sortFiles(MenuItem item){
- switch ( item.getItemId() ) {
- case R.id.menu_sort_az:
- if( sortMode == FileUtilities.SORT_AZ ){
- sortMode = FileUtilities.SORT_ZA;
- }else{
- sortMode = FileUtilities.SORT_AZ;
- }
- break;
- case R.id.menu_sort_modified:
- if( sortMode == FileUtilities.SORT_NEWEST ){
- sortMode = FileUtilities.SORT_OLDEST;
- }else{
- sortMode = FileUtilities.SORT_NEWEST;
- }
- break;
- case R.id.menu_sort_size:
- if( sortMode == FileUtilities.SORT_LARGEST ){
- sortMode = FileUtilities.SORT_SMALLEST;
- }else{
- sortMode = FileUtilities.SORT_LARGEST;
- }
- break;
- default:
- break;
- }
- this.onResume();
- return;
- }
-
- public void readPreferences(){
- prefs = getSharedPreferences(EXPLORER_PREFS_KEY, MODE_PRIVATE);
- viewMode = prefs.getInt( EXPLORER_VIEW_TYPE_KEY, GRID_VIEW);
- sortMode = prefs.getInt( SORT_MODE_KEY, FileUtilities.SORT_AZ );
- SharedPreferences defaultPrefs = PreferenceManager.getDefaultSharedPreferences( getBaseContext() );
- filterMode = Integer.valueOf( defaultPrefs.getString( FILTER_MODE_KEY , "-1") );
- sortMode = Integer.valueOf( defaultPrefs.getString( SORT_MODE_KEY , "-1") );
- }
-
- public void editPreferences(MenuItem item){
- startActivity( new Intent( this , PreferenceEditor.class) );
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- // TODO Auto-generated method stub
- super.onSaveInstanceState(outState);
- outState.putString( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath() );
- outState.putInt( FILTER_MODE_KEY , filterMode );
- outState.putInt( EXPLORER_VIEW_TYPE_KEY , viewMode );
-
- Log.d(tag, currentDirectory.toString() + Integer.toString(filterMode ) + Integer.toString(viewMode) );
- //prefs.edit().putInt(EXPLORER_VIEW_TYPE, viewType).commit();
- Log.d(tag, "savedInstanceSate");
- }
-
- @Override
- protected void onRestoreInstanceState(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onRestoreInstanceState(savedInstanceState);
- if( savedInstanceState.isEmpty() ){
- return;
- }
- currentDirectory = new File( savedInstanceState.getString( CURRENT_DIRECTORY_KEY ) );
- filterMode = savedInstanceState.getInt( FILTER_MODE_KEY , FileUtilities.ALL ) ;
- viewMode = savedInstanceState.getInt( EXPLORER_VIEW_TYPE_KEY , GRID_VIEW );
- //openDirectory( currentDirectory );
- Log.d(tag, "onRestoreInstanceState");
- Log.d(tag, currentDirectory.toString() + Integer.toString(filterMode ) + Integer.toString(viewMode) );
- }
-
- @Override
- protected void onPause() {
- //prefs.edit().putInt(EXPLORER_VIEW_TYPE, viewType).commit();
- super.onPause();
- Log.d(tag, "onPause");
- }
-
- @Override
- protected void onResume() {
- // TODO Auto-generated method stub
- super.onResume();
- Log.d(tag, "onResume");
- readPreferences();// intent values take precedence over prefs?
- Intent i = this.getIntent();
- if( i.hasExtra( CURRENT_DIRECTORY_KEY ) ){
- currentDirectory = new File( i.getStringExtra( CURRENT_DIRECTORY_KEY ) );
- Log.d(tag, CURRENT_DIRECTORY_KEY);
- }
- if( i.hasExtra( FILTER_MODE_KEY ) ){
- filterMode = i.getIntExtra( FILTER_MODE_KEY, FileUtilities.ALL);
- Log.d(tag, FILTER_MODE_KEY);
- }
- if( i.hasExtra( EXPLORER_VIEW_TYPE_KEY ) ){
- viewMode = i.getIntExtra( EXPLORER_VIEW_TYPE_KEY, GRID_VIEW);
- Log.d(tag, EXPLORER_VIEW_TYPE_KEY);
- }
- createUI();
- openDirectory( currentDirectory );
- }
-
- @Override
- protected void onStart() {
- // TODO Auto-generated method stub
- super.onStart();
- Log.d(tag, "onStart");
- }
-
- @Override
- protected void onStop() {
- // TODO Auto-generated method stub
- super.onStop();
- Log.d(tag, "onStop");
- }
-
- @Override
- protected void onDestroy() {
- // TODO Auto-generated method stub
- super.onDestroy();
-
- Log.d(tag, "onDestroy");
- }
-
- public boolean onNavigationItemSelected(int itemPosition, long itemId) {
- filterMode = itemPosition -1; //bit of a hack, I know. -1 is ALL 0 Docs etc
- openDirectory( currentDirectory );// Uses filter mode
- return true;
- }
-
-class ListItemAdapter implements ListAdapter{
- private Context mContext;
- private File[] filePaths;
- private final long KB = 1024;
- private final long MB = 1048576;
-
- public ListItemAdapter(Context mContext, File[] filePaths) {
- this.mContext = mContext;
- this.filePaths = filePaths;
- }
-
- public int getCount() {
- // TODO Auto-generated method stub
- return filePaths.length;
- }
-
- public Object getItem(int arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public long getItemId(int arg0) {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int getItemViewType(int arg0) {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public View getView(int position, View convertView, ViewGroup parent) {
- LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
- Context.LAYOUT_INFLATER_SERVICE);
-
- View listItem;
-
- if (convertView == null) {
- listItem = new View(mContext);
- listItem = inflater.inflate(R.layout.file_list_item, null);
- } else {
- listItem = (View) convertView;
- }
- final int pos = position;
- listItem.setClickable(true);
- listItem.setOnClickListener(new OnClickListener() {
-
- public void onClick(View v) {
- Log.d("LIST", "click!");
- if(filePaths[ pos ].isDirectory() ){
- openDirectory( filePaths[ pos ] );
- }else{
- open( filePaths[ pos ].getName() );
- }
- }
- });
-
-
-
- // set value into textview
- TextView filename = (TextView) listItem.findViewById(R.id.file_list_item_name);
- filename.setText( filePaths[ position ].getName() );
- //filename.setClickable(true);
-
- TextView fileSize = (TextView) listItem.findViewById(R.id.file_list_item_size);
- //TODO Give size in KB , MB as appropriate.
- String size = "0B";
- long length = filePaths[ position ].length();
- if( length < KB ){
- size = Long.toString( length ) + "B";
- }
- if( length >= KB && length < MB){
- size = Long.toString( length/KB ) + "KB";
- }
- if( length >= MB){
- size = Long.toString( length/MB ) + "MB";
- }
- fileSize.setText( size );
- //fileSize.setClickable(true);
-
- TextView fileDate = (TextView) listItem.findViewById(R.id.file_list_item_date);
- SimpleDateFormat df = new SimpleDateFormat("dd MMM yyyy hh:ss");
- Date date = new Date( filePaths[ position ].lastModified() );
- //TODO format date
- fileDate.setText( df.format( date ) );
-
- // set image based on selected text
- ImageView imageView = (ImageView) listItem.findViewById(R.id.file_list_item_icon);
- if( filePaths[position].getName().endsWith(".odt") ){
- imageView.setImageResource(R.drawable.writer);
- }
- if( filePaths[position].getName().endsWith(".ods") ){
- imageView.setImageResource(R.drawable.calc);
- }
- if( filePaths[position].getName().endsWith(".odp") ){
- imageView.setImageResource(R.drawable.impress);
- }
- if( filePaths[position].isDirectory() ){
- //Eventually have thumbnails of each sub file on a black circle
- //For now just a folder icon
- imageView.setImageResource(R.drawable.folder);
- }
- //imageView.setClickable(true);
- return listItem;
- }
-
- public int getViewTypeCount() {
- // TODO Auto-generated method stub
- return 1;
- }
-
- public boolean hasStableIds() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isEmpty() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void registerDataSetObserver(DataSetObserver arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void unregisterDataSetObserver(DataSetObserver arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public boolean areAllItemsEnabled() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isEnabled(int position) {
- // TODO Auto-generated method stub
- return false;
- }
-
- }
-
-}
-
-
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/ListItemAdapter.java b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/ListItemAdapter.java
deleted file mode 100644
index 1e66e3a..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/ListItemAdapter.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.libreoffice.ui;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import android.content.Context;
-import android.database.DataSetObserver;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-/*Currently this is class is not used but instead is implemented as an inner class in LibreOfficeUI.
- * This is because I can't get the onItemClickListener to fire on the listview so I need to set an
- * onClick listener in the adapter. ( I've tried turning off the focusability etc of the listitem
- * contents but no dice...) */
-public class ListItemAdapter implements ListAdapter{
- private Context mContext;
- private File[] filePaths;
- private final long KB = 1024;
- private final long MB = 1048576;
-
- public ListItemAdapter(Context mContext, File[] filePaths) {
- this.mContext = mContext;
- this.filePaths = filePaths;
- }
-
- public int getCount() {
- // TODO Auto-generated method stub
- return filePaths.length;
- }
-
- public Object getItem(int arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public long getItemId(int arg0) {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int getItemViewType(int arg0) {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public View getView(int position, View convertView, ViewGroup parent) {
- LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
- Context.LAYOUT_INFLATER_SERVICE);
-
- View listItem;
-
- if (convertView == null) {
- listItem = new View(mContext);
- listItem = inflater.inflate(R.layout.file_list_item, null);
- } else {
- listItem = (View) convertView;
- }
-
- listItem.setClickable(true);
- listItem.setOnClickListener(new OnClickListener() {
-
- public void onClick(View v) {
- Log.d("LIST", "click!");
- }
- });
-
-
-
- // set value into textview
- TextView filename = (TextView) listItem.findViewById(R.id.file_list_item_name);
- filename.setText( filePaths[ position ].getName() );
- //filename.setClickable(true);
-
- TextView fileSize = (TextView) listItem.findViewById(R.id.file_list_item_size);
- //TODO Give size in KB , MB as appropriate.
- String size = "0B";
- long length = filePaths[ position ].length();
- if( length < KB ){
- size = Long.toString( length ) + "B";
- }
- if( length >= KB && length < MB){
- size = Long.toString( length/KB ) + "KB";
- }
- if( length >= MB){
- size = Long.toString( length/MB ) + "MB";
- }
- fileSize.setText( size );
- //fileSize.setClickable(true);
-
- TextView fileDate = (TextView) listItem.findViewById(R.id.file_list_item_date);
- SimpleDateFormat df = new SimpleDateFormat("dd MMM yyyy hh:ss");
- Date date = new Date( filePaths[ position ].lastModified() );
- //TODO format date
- fileDate.setText( df.format( date ) );
-
- // set image based on selected text
- ImageView imageView = (ImageView) listItem.findViewById(R.id.file_list_item_icon);
- if( filePaths[position].getName().endsWith(".odt") ){
- imageView.setImageResource(R.drawable.writer);
- }
- if( filePaths[position].getName().endsWith(".ods") ){
- imageView.setImageResource(R.drawable.calc);
- }
- if( filePaths[position].getName().endsWith(".odp") ){
- imageView.setImageResource(R.drawable.impress);
- }
- if( filePaths[position].isDirectory() ){
- //Eventually have thumbnails of each sub file on a black circle
- //For now just a folder icon
- imageView.setImageResource(R.drawable.folder);
- }
- //imageView.setClickable(true);
- return listItem;
- }
-
- public int getViewTypeCount() {
- // TODO Auto-generated method stub
- return 1;
- }
-
- public boolean hasStableIds() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isEmpty() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void registerDataSetObserver(DataSetObserver arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public void unregisterDataSetObserver(DataSetObserver arg0) {
- // TODO Auto-generated method stub
-
- }
-
- public boolean areAllItemsEnabled() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isEnabled(int position) {
- // TODO Auto-generated method stub
- return false;
- }
-
-}
-
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PageView.java b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PageView.java
deleted file mode 100644
index 5edb6ea..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PageView.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.libreoffice.ui;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-
-public class PageView extends View{
- private Bitmap bmp;
- private Paint mPaintBlack;
- private String tag = "PageView";
-
- public PageView(Context context ) {
- super(context);
- bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);
- intialise();
- }
- public PageView(Context context, AttributeSet attrs) {
- super(context, attrs);
- bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);
- Log.d( tag , bmp.toString());
- intialise();
- }
- public PageView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);//load a "page"
- intialise();
- }
-
- private void intialise(){
- mPaintBlack = new Paint();
- mPaintBlack.setARGB(255, 0, 0, 0);
- Log.d(tag, " Doing some set-up");
- }
-
- public void setBitmap(Bitmap bmp){
- this.bmp = bmp;
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- Log.d(tag, "Draw");
- Log.d(tag, Integer.toString(bmp.getHeight()));
- if( bmp != null ){
- int horizontalMargin = (int) (canvas.getWidth()*0.1);
- //int verticalMargin = (int) (canvas.getHeight()*0.1);
- int verticalMargin = horizontalMargin;
- canvas.drawBitmap(bmp, new Rect(0, 0, bmp.getWidth(), bmp.getHeight()),
- new Rect(horizontalMargin,verticalMargin,canvas.getWidth()-horizontalMargin,
- canvas.getHeight()-verticalMargin),
- mPaintBlack);//
- }
- if( bmp == null)
- canvas.drawText("Bmp is null!", 100, 100, new Paint());
- }
-
-}
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PreferenceEditor.java b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PreferenceEditor.java
deleted file mode 100644
index dec509d..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/PreferenceEditor.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.libreoffice.ui;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
-
-public class PreferenceEditor extends PreferenceActivity {
- public final static String FilterTypePrefKey = "FilterTypePreference";
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource( R.xml.libreoffice_preferences );
- //mPrefs = getSharedPreferences( LibreOfficeUIActivity.EXPLORER_PREFS_KEY , MODE_PRIVATE );
- }
-}
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/WriterViewerActivity.java b/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/WriterViewerActivity.java
deleted file mode 100644
index fe2f113..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/LibreOfficeUI/src/org/libreoffice/ui/WriterViewerActivity.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.libreoffice.ui;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.MenuItem;
-
-public class WriterViewerActivity extends Activity{
- private Bundle extras;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onCreate(savedInstanceState);
- extras = getIntent().getExtras();
- setContentView(R.layout.main);
- ActionBar actionBar = getActionBar();
- actionBar.setDisplayHomeAsUpEnabled(true);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- // app icon in action bar clicked; go home
- Intent intent = new Intent(this, LibreOfficeUIActivity.class);
- intent.putExtras( extras );
- //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- startActivity(intent);
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
-}
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.classpath b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.classpath
deleted file mode 100644
index a4763d1..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.project b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.project
deleted file mode 100644
index 59b93ac..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>TextturePage</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/AndroidManifest.xml b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/AndroidManifest.xml
deleted file mode 100644
index a9e1460..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="libreoffice.android.ui"
- android:versionCode="1"
- android:versionName="1.0" >
-
- <uses-sdk android:minSdkVersion="11" />
-
- <application
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name" >
- <activity
- android:name=".TextturePageActivity"
- android:label="@string/app_name" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-
-</manifest>
\ No newline at end of file
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/proguard-project.txt b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/GSoC-2012-eclipse-workspace/TextturePage/project.properties b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/project.properties
deleted file mode 100644
index 4d07452..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-11
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/dummy_page.png b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/dummy_page.png
deleted file mode 100644
index c58d276..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/dummy_page.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/ic_launcher.png b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/jay.png b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/jay.png
deleted file mode 100644
index 03a72c1..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/jay.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/ph_800_1280_dddddd.png b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/ph_800_1280_dddddd.png
deleted file mode 100644
index a7c632a..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-hdpi/ph_800_1280_dddddd.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-ldpi/ic_launcher.png b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 9923872..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-mdpi/ic_launcher.png b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047d..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-xhdpi/ic_launcher.png b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d76..0000000
Binary files a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/layout/main.xml b/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/layout/main.xml
deleted file mode 100644
index bc12cd8..0000000
--- a/android/experimental/GSoC-2012-eclipse-workspace/TextturePage/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list