[Libreoffice-commits] core.git: android/CustomTarget_android_desktop.mk android/CustomTarget_lo4android.mk android/experimental android/Module_android.mk
Jacobo Aragunde Pérez
jaragunde at igalia.com
Thu Sep 18 13:52:34 PDT 2014
android/CustomTarget_android_desktop.mk | 14
android/CustomTarget_lo4android.mk | 36
android/Module_android.mk | 1
android/experimental/LOAndroid3/AndroidManifest.xml | 9
android/experimental/LOAndroid3/res/drawable-hdpi/action_search.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/action_search_light.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_img.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_split_img.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_compose.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_compose_inverse.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_launcher_settings.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_magnifying_glass.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_refresh.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_refresh_inverse.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_search.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_search_inverse.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/ic_title_share_default.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/icon.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/light_sort_by_size.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_grid.png |binary
android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_list.png |binary
android/experimental/LOAndroid3/res/drawable-ldpi/ic_launcher.png |binary
android/experimental/LOAndroid3/res/drawable-ldpi/icon.png |binary
android/experimental/LOAndroid3/res/drawable-ldpi/lo_icon.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_img.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_split_img.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/ic_compose.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/ic_compose_inverse.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/ic_launcher_settings.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/ic_magnifying_glass.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/ic_refresh.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/ic_refresh_inverse.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/ic_search.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/ic_search_inverse.png |binary
android/experimental/LOAndroid3/res/drawable-mdpi/icon.png |binary
android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_img.png |binary
android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_split_img.png |binary
android/experimental/LOAndroid3/res/drawable-xhdpi/ic_launcher_settings.png |binary
android/experimental/LOAndroid3/res/drawable-xhdpi/icon.png |binary
android/experimental/LOAndroid3/res/drawable/base.png |binary
android/experimental/LOAndroid3/res/drawable/bg_striped.xml | 6
android/experimental/LOAndroid3/res/drawable/bg_striped_split.xml | 6
android/experimental/LOAndroid3/res/drawable/black_white_gradient.xml | 15
android/experimental/LOAndroid3/res/drawable/calc.png |binary
android/experimental/LOAndroid3/res/drawable/draw.png |binary
android/experimental/LOAndroid3/res/drawable/dummy_page.png |binary
android/experimental/LOAndroid3/res/drawable/folder.png |binary
android/experimental/LOAndroid3/res/drawable/impress.png |binary
android/experimental/LOAndroid3/res/drawable/writer.png |binary
android/experimental/LOAndroid3/res/layout/document_viewer.xml | 33
android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml | 35
android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml | 36
android/experimental/LOAndroid3/res/layout/file_grid.xml | 27
android/experimental/LOAndroid3/res/layout/file_list.xml | 20
android/experimental/LOAndroid3/res/layout/file_list_item.xml | 47
android/experimental/LOAndroid3/res/layout/main.xml | 22
android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml | 23
android/experimental/LOAndroid3/res/menu/view_menu.xml | 16
android/experimental/LOAndroid3/res/values/arrays.xml | 56
android/experimental/LOAndroid3/res/values/strings.xml | 11
android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml | 21
android/experimental/LOAndroid3/src/java/com/polites/android/Animation.java | 28
android/experimental/LOAndroid3/src/java/com/polites/android/Animator.java | 91
android/experimental/LOAndroid3/src/java/com/polites/android/FlingAnimation.java | 70
android/experimental/LOAndroid3/src/java/com/polites/android/FlingAnimationListener.java | 24
android/experimental/LOAndroid3/src/java/com/polites/android/FlingListener.java | 40
android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageView.java | 712 +++++
android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageViewListener.java | 26
android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageViewTouchListener.java | 540 ++++
android/experimental/LOAndroid3/src/java/com/polites/android/MathUtils.java | 76
android/experimental/LOAndroid3/src/java/com/polites/android/MoveAnimation.java | 102
android/experimental/LOAndroid3/src/java/com/polites/android/MoveAnimationListener.java | 22
android/experimental/LOAndroid3/src/java/com/polites/android/VectorF.java | 63
android/experimental/LOAndroid3/src/java/com/polites/android/ZoomAnimation.java | 162 +
android/experimental/LOAndroid3/src/java/com/polites/android/ZoomAnimationListener.java | 21
android/experimental/LOAndroid3/src/java/org/libreoffice/android/DocumentLoader.java | 1257 ++++++++++
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java | 229 +
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java | 197 +
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java | 147 +
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 953 +++++++
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java | 168 +
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java | 65
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PreferenceEditor.java | 27
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java | 47
android/experimental/LibreOffice4Android/AndroidManifest.xml | 42
android/experimental/LibreOffice4Android/Makefile | 38
android/experimental/LibreOffice4Android/build.xml | 84
android/experimental/LibreOffice4Android/dummies.cxx | 75
android/experimental/LibreOffice4Android/fonts.conf | 154 -
android/experimental/LibreOffice4Android/jni/Android.mk | 8
android/experimental/LibreOffice4Android/proguard-project.txt | 20
android/experimental/LibreOffice4Android/project.properties | 17
android/experimental/LibreOffice4Android/res/drawable/bg_striped.xml | 6
android/experimental/LibreOffice4Android/res/drawable/bg_striped_split.xml | 6
android/experimental/LibreOffice4Android/res/drawable/black_white_gradient.xml | 15
android/experimental/LibreOffice4Android/res/layout/document_viewer.xml | 33
android/experimental/LibreOffice4Android/res/layout/file_explorer_folder_icon.xml | 35
android/experimental/LibreOffice4Android/res/layout/file_explorer_grid_item.xml | 36
android/experimental/LibreOffice4Android/res/layout/file_grid.xml | 27
android/experimental/LibreOffice4Android/res/layout/file_list.xml | 20
android/experimental/LibreOffice4Android/res/layout/file_list_item.xml | 47
android/experimental/LibreOffice4Android/res/layout/main.xml | 22
android/experimental/LibreOffice4Android/res/layout/navigation_grid_item.xml | 23
android/experimental/LibreOffice4Android/res/menu/view_menu.xml | 16
android/experimental/LibreOffice4Android/res/values/arrays.xml | 56
android/experimental/LibreOffice4Android/res/values/strings.xml | 16
android/experimental/LibreOffice4Android/res/values/styles.xml | 24
android/experimental/LibreOffice4Android/res/xml/libreoffice_preferences.xml | 21
android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java | 28
android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java | 91
android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java | 70
android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java | 24
android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java | 40
android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageView.java | 712 -----
android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java | 26
android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewTouchListener.java | 540 ----
android/experimental/LibreOffice4Android/src/com/polites/android/MathUtils.java | 76
android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java | 102
android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java | 22
android/experimental/LibreOffice4Android/src/com/polites/android/VectorF.java | 63
android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java | 162 -
android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java | 21
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java | 1257 ----------
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java | 229 -
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java | 197 -
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/GridItemAdapter.java | 147 -
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java | 953 -------
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/ListItemAdapter.java | 168 -
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PageView.java | 65
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PreferenceEditor.java | 27
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/WriterViewerActivity.java | 47
dev/null |binary
132 files changed, 5456 insertions(+), 5953 deletions(-)
New commits:
commit 71832a527a936bbb8e76154cbd3ffc491ea31b58
Author: Jacobo Aragunde Pérez <jaragunde at igalia.com>
Date: Fri Sep 12 10:40:59 2014 +0200
Android: merge LibreOffice4Android into LOAndroid3
This commit merges the code of the document browser found in
android/experimental/LibreOffice4Android into the new document viewer
at LOAndroid3. All the source and resources is moved, and some
duplicated files are removed.
From now on the apk generated by LOAndroid3 will provide the document
browser too.
Slightly modified the build files of ExperimentalDesktop project
because they depended on LibreOffice4Android being built.
Change-Id: I0579afda7b570509ca4d3873c28a13fcbeeb5ab8
Reviewed-on: https://gerrit.libreoffice.org/11487
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
Tested-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk
index ca0d0c5..e301ee9 100644
--- a/android/CustomTarget_android_desktop.mk
+++ b/android/CustomTarget_android_desktop.mk
@@ -13,15 +13,13 @@ android_desktop_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/D
$(call gb_CustomTarget_get_target,android/desktop) : \
$(android_desktop_DIR)/done
-# We know that CustomTarget_lo4android.mk is included before this file
-# in Module_android.mk, so lo4android_DIR is defined. We want that to
-# be built completely first, so that we can serialize Ant access to
-# Bootstrap and abs-lib, which are used by Desktop (this makefile),
-# LibreOffice4Android and sdremote. We don't want one Ant to be
-# cleaning out one place while another is building stuff that depends
-# on it. Yeah, this sucks
+# We want that to be built completely first,
+# so that we can serialize Ant access to Bootstrap, which is used
+# by several LO-android apps. We don't want one Ant to be cleaning
+# out Bootstrap while another is building stuff that depends on it.
+# Yeah, this sucks
-$(android_desktop_DIR)/done : $(lo4android_DIR)/done
+$(android_desktop_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/desktop && $(MAKE) all
# Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script
diff --git a/android/CustomTarget_lo4android.mk b/android/CustomTarget_lo4android.mk
deleted file mode 100644
index f7c0f86..0000000
--- a/android/CustomTarget_lo4android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_CustomTarget_CustomTarget,android/lo4android))
-
-lo4android_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LibreOffice4Android)
-
-$(call gb_CustomTarget_get_target,android/lo4android) : \
- $(lo4android_DIR)/done
-
-# We want that to be built completely first,
-# so that we can serialize Ant access to Bootstrap, which is used both
-# by DocumentLoader. We don't want one Ant to be cleaning
-# out Bootstrap while another is building stuff that depends on it.
-# Yeah, this sucks
-
-$(lo4android_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
- cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all
-# Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script
-# still looks for the .apk, and we want fresh daily builds to be uploaded. Even if
-# the apps as such are mostly useless.
-# Us "foo" instead of the old INPATH
- mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
- cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
-
-$(call gb_CustomTarget_get_clean_target,android/lo4android) :
- $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
- cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) clean
-
-# vim: set noet sw=4 ts=4:
diff --git a/android/Module_android.mk b/android/Module_android.mk
index eedc57a..4b8485a 100644
--- a/android/Module_android.mk
+++ b/android/Module_android.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,android))
ifeq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,android,\
- CustomTarget_lo4android \
CustomTarget_lo_android \
CustomTarget_android_desktop \
))
diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml b/android/experimental/LOAndroid3/AndroidManifest.xml
index 635e399..d2430ea 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml
@@ -69,6 +69,15 @@
</intent-filter>
</activity>
+ <!-- Document Browser Activity -->
+ <activity android:name=".ui.LibreOfficeUIActivity"
+ android:label="@string/browser_app_name"
+ android:theme="@android:style/Theme.Holo">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
</application>
</manifest>
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/action_search.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_search.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/action_search.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/action_search.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/action_search_light.png b/android/experimental/LOAndroid3/res/drawable-hdpi/action_search_light.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/action_search_light.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/action_search_light.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped_img.png b/android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_img.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped_img.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_img.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped_split_img.png b/android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_split_img.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/bg_striped_split_img.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_split_img.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_compose.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_compose.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_compose.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_compose.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_compose_inverse.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_compose_inverse.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_compose_inverse.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_compose_inverse.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_launcher_settings.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_launcher_settings.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_launcher_settings.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_launcher_settings.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_magnifying_glass.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_magnifying_glass.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_magnifying_glass.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_magnifying_glass.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_refresh.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_refresh.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_refresh.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_refresh.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_refresh_inverse.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_refresh_inverse.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_refresh_inverse.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_refresh_inverse.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_search.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_search.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_search.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_search.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_search_inverse.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_search_inverse.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_search_inverse.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_search_inverse.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_title_share_default.png b/android/experimental/LOAndroid3/res/drawable-hdpi/ic_title_share_default.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_title_share_default.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/ic_title_share_default.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/icon.png b/android/experimental/LOAndroid3/res/drawable-hdpi/icon.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/icon.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/icon.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/light_sort_by_size.png b/android/experimental/LOAndroid3/res/drawable-hdpi/light_sort_by_size.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/light_sort_by_size.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/light_sort_by_size.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/light_view_as_grid.png b/android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_grid.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/light_view_as_grid.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_grid.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/light_view_as_list.png b/android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_list.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-hdpi/light_view_as_list.png
rename to android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_list.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-ldpi/ic_launcher.png b/android/experimental/LOAndroid3/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-ldpi/ic_launcher.png
rename to android/experimental/LOAndroid3/res/drawable-ldpi/ic_launcher.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-ldpi/icon.png b/android/experimental/LOAndroid3/res/drawable-ldpi/icon.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-ldpi/icon.png
rename to android/experimental/LOAndroid3/res/drawable-ldpi/icon.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-ldpi/lo_icon.png b/android/experimental/LOAndroid3/res/drawable-ldpi/lo_icon.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-ldpi/lo_icon.png
rename to android/experimental/LOAndroid3/res/drawable-ldpi/lo_icon.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/bg_striped_img.png b/android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_img.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/bg_striped_img.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_img.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/bg_striped_split_img.png b/android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_split_img.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/bg_striped_split_img.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_split_img.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_compose.png b/android/experimental/LOAndroid3/res/drawable-mdpi/ic_compose.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_compose.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/ic_compose.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_compose_inverse.png b/android/experimental/LOAndroid3/res/drawable-mdpi/ic_compose_inverse.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_compose_inverse.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/ic_compose_inverse.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_launcher_settings.png b/android/experimental/LOAndroid3/res/drawable-mdpi/ic_launcher_settings.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_launcher_settings.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/ic_launcher_settings.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_magnifying_glass.png b/android/experimental/LOAndroid3/res/drawable-mdpi/ic_magnifying_glass.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_magnifying_glass.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/ic_magnifying_glass.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_refresh.png b/android/experimental/LOAndroid3/res/drawable-mdpi/ic_refresh.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_refresh.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/ic_refresh.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_refresh_inverse.png b/android/experimental/LOAndroid3/res/drawable-mdpi/ic_refresh_inverse.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_refresh_inverse.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/ic_refresh_inverse.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_search.png b/android/experimental/LOAndroid3/res/drawable-mdpi/ic_search.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_search.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/ic_search.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_search_inverse.png b/android/experimental/LOAndroid3/res/drawable-mdpi/ic_search_inverse.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_search_inverse.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/ic_search_inverse.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/icon.png b/android/experimental/LOAndroid3/res/drawable-mdpi/icon.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-mdpi/icon.png
rename to android/experimental/LOAndroid3/res/drawable-mdpi/icon.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-xhdpi/bg_striped_img.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_img.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-xhdpi/bg_striped_img.png
rename to android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_img.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-xhdpi/bg_striped_split_img.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_split_img.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-xhdpi/bg_striped_split_img.png
rename to android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_split_img.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-xhdpi/ic_launcher_settings.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/ic_launcher_settings.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-xhdpi/ic_launcher_settings.png
rename to android/experimental/LOAndroid3/res/drawable-xhdpi/ic_launcher_settings.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable-xhdpi/icon.png b/android/experimental/LOAndroid3/res/drawable-xhdpi/icon.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable-xhdpi/icon.png
rename to android/experimental/LOAndroid3/res/drawable-xhdpi/icon.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable/base.png b/android/experimental/LOAndroid3/res/drawable/base.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/base.png
rename to android/experimental/LOAndroid3/res/drawable/base.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable/bg_striped.xml b/android/experimental/LOAndroid3/res/drawable/bg_striped.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/bg_striped.xml
rename to android/experimental/LOAndroid3/res/drawable/bg_striped.xml
diff --git a/android/experimental/LibreOffice4Android/res/drawable/bg_striped_split.xml b/android/experimental/LOAndroid3/res/drawable/bg_striped_split.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/bg_striped_split.xml
rename to android/experimental/LOAndroid3/res/drawable/bg_striped_split.xml
diff --git a/android/experimental/LibreOffice4Android/res/drawable/black_white_gradient.xml b/android/experimental/LOAndroid3/res/drawable/black_white_gradient.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/black_white_gradient.xml
rename to android/experimental/LOAndroid3/res/drawable/black_white_gradient.xml
diff --git a/android/experimental/LibreOffice4Android/res/drawable/calc.png b/android/experimental/LOAndroid3/res/drawable/calc.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/calc.png
rename to android/experimental/LOAndroid3/res/drawable/calc.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable/draw.png b/android/experimental/LOAndroid3/res/drawable/draw.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/draw.png
rename to android/experimental/LOAndroid3/res/drawable/draw.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable/dummy_page.png b/android/experimental/LOAndroid3/res/drawable/dummy_page.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/dummy_page.png
rename to android/experimental/LOAndroid3/res/drawable/dummy_page.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable/folder.png b/android/experimental/LOAndroid3/res/drawable/folder.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/folder.png
rename to android/experimental/LOAndroid3/res/drawable/folder.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable/impress.png b/android/experimental/LOAndroid3/res/drawable/impress.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/impress.png
rename to android/experimental/LOAndroid3/res/drawable/impress.png
diff --git a/android/experimental/LibreOffice4Android/res/drawable/writer.png b/android/experimental/LOAndroid3/res/drawable/writer.png
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/drawable/writer.png
rename to android/experimental/LOAndroid3/res/drawable/writer.png
diff --git a/android/experimental/LibreOffice4Android/res/layout/document_viewer.xml b/android/experimental/LOAndroid3/res/layout/document_viewer.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/layout/document_viewer.xml
rename to android/experimental/LOAndroid3/res/layout/document_viewer.xml
diff --git a/android/experimental/LibreOffice4Android/res/layout/file_explorer_folder_icon.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/layout/file_explorer_folder_icon.xml
rename to android/experimental/LOAndroid3/res/layout/file_explorer_folder_icon.xml
diff --git a/android/experimental/LibreOffice4Android/res/layout/file_explorer_grid_item.xml b/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/layout/file_explorer_grid_item.xml
rename to android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
diff --git a/android/experimental/LibreOffice4Android/res/layout/file_grid.xml b/android/experimental/LOAndroid3/res/layout/file_grid.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/layout/file_grid.xml
rename to android/experimental/LOAndroid3/res/layout/file_grid.xml
diff --git a/android/experimental/LibreOffice4Android/res/layout/file_list.xml b/android/experimental/LOAndroid3/res/layout/file_list.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/layout/file_list.xml
rename to android/experimental/LOAndroid3/res/layout/file_list.xml
diff --git a/android/experimental/LibreOffice4Android/res/layout/file_list_item.xml b/android/experimental/LOAndroid3/res/layout/file_list_item.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/layout/file_list_item.xml
rename to android/experimental/LOAndroid3/res/layout/file_list_item.xml
diff --git a/android/experimental/LibreOffice4Android/res/layout/main.xml b/android/experimental/LOAndroid3/res/layout/main.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/layout/main.xml
rename to android/experimental/LOAndroid3/res/layout/main.xml
diff --git a/android/experimental/LibreOffice4Android/res/layout/navigation_grid_item.xml b/android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/layout/navigation_grid_item.xml
rename to android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml
diff --git a/android/experimental/LibreOffice4Android/res/menu/view_menu.xml b/android/experimental/LOAndroid3/res/menu/view_menu.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/menu/view_menu.xml
rename to android/experimental/LOAndroid3/res/menu/view_menu.xml
diff --git a/android/experimental/LibreOffice4Android/res/values/arrays.xml b/android/experimental/LOAndroid3/res/values/arrays.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/values/arrays.xml
rename to android/experimental/LOAndroid3/res/values/arrays.xml
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml
index d776082..d69b331 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -4,5 +4,16 @@
<string name="app_name">LibreOffice</string>
<string name="action_settings">Settings</string>
<string name="action_list">Parts</string>
+ <string name="browser_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>
diff --git a/android/experimental/LibreOffice4Android/res/xml/libreoffice_preferences.xml b/android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml
similarity index 100%
rename from android/experimental/LibreOffice4Android/res/xml/libreoffice_preferences.xml
rename to android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java b/android/experimental/LOAndroid3/src/java/com/polites/android/Animation.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/Animation.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/Animation.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java b/android/experimental/LOAndroid3/src/java/com/polites/android/Animator.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/Animator.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/Animator.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java b/android/experimental/LOAndroid3/src/java/com/polites/android/FlingAnimation.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimation.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/FlingAnimation.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java b/android/experimental/LOAndroid3/src/java/com/polites/android/FlingAnimationListener.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/FlingAnimationListener.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/FlingAnimationListener.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java b/android/experimental/LOAndroid3/src/java/com/polites/android/FlingListener.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/FlingListener.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/FlingListener.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageView.java b/android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageView.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageView.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageView.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java b/android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageViewListener.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewListener.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageViewListener.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewTouchListener.java b/android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageViewTouchListener.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/GestureImageViewTouchListener.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/GestureImageViewTouchListener.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/MathUtils.java b/android/experimental/LOAndroid3/src/java/com/polites/android/MathUtils.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/MathUtils.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/MathUtils.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java b/android/experimental/LOAndroid3/src/java/com/polites/android/MoveAnimation.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimation.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/MoveAnimation.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java b/android/experimental/LOAndroid3/src/java/com/polites/android/MoveAnimationListener.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/MoveAnimationListener.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/MoveAnimationListener.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/VectorF.java b/android/experimental/LOAndroid3/src/java/com/polites/android/VectorF.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/VectorF.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/VectorF.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java b/android/experimental/LOAndroid3/src/java/com/polites/android/ZoomAnimation.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimation.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/ZoomAnimation.java
diff --git a/android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java b/android/experimental/LOAndroid3/src/java/com/polites/android/ZoomAnimationListener.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/com/polites/android/ZoomAnimationListener.java
rename to android/experimental/LOAndroid3/src/java/com/polites/android/ZoomAnimationListener.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/android/DocumentLoader.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/android/DocumentLoader.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FolderIconView.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/GridItemAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/ui/GridItemAdapter.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/ListItemAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/ui/ListItemAdapter.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/ui/ListItemAdapter.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PageView.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PageView.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PreferenceEditor.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PreferenceEditor.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/ui/PreferenceEditor.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PreferenceEditor.java
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/WriterViewerActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java
similarity index 100%
rename from android/experimental/LibreOffice4Android/src/org/libreoffice/ui/WriterViewerActivity.java
rename to android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java
diff --git a/android/experimental/LibreOffice4Android/AndroidManifest.xml b/android/experimental/LibreOffice4Android/AndroidManifest.xml
deleted file mode 100644
index 01ee311..0000000
--- a/android/experimental/LibreOffice4Android/AndroidManifest.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.libreoffice"
- android:installLocation="preferExternal"
- android:versionCode="1"
- android:versionName="1.0">
-
- <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="11"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
- <application android:debuggable="true"
- android:largeHeap="true"
- android:hardwareAccelerated="true"
- android:icon="@drawable/lo_icon"
- android:label="@string/app_name" >
-
- <!-- Original Document Loader activity - file Viewer -->
- <activity android:name=".android.DocumentLoader"
- android:theme="@style/DocumentViewer"
- android:label="DocumentLoader"
- android:configChanges="orientation|keyboardHidden">
- <!-- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>-->
- </activity>
- <!-- File Explorer Activities taken from eclipse workspace -->
- <activity android:name=".ui.LibreOfficeUIActivity"
- android:label="@string/app_name"
- android:theme="@android:style/Theme.Holo">
- <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=".ui.WriterViewerActivity">
- <intent-filter android:label="writer_viewer"></intent-filter>
- </activity>
- <activity android:name=".ui.PreferenceEditor"></activity>
-
- </application>
-</manifest>
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
deleted file mode 100644
index 125cf74..0000000
--- a/android/experimental/LibreOffice4Android/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-ifeq ($(BUILDDIR),)
-include ../../../config_host.mk
-endif
-
-# The default target just builds.
-
-all: build-ant
-
-# The package of this app
-APP_PACKAGE=org.libreoffice
-
-BOOTSTRAPDIR=../../Bootstrap
-include $(BOOTSTRAPDIR)/Makefile.shared
-
-native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
- $< \
- -g core -g writer \
- > $@
-
-build-ant: android_version_setup copy-stuff link-so properties
-#
-# Copy jar files we need
-#
- for F in java_uno \
- juh \
- jurt \
- ridl \
- unoloader; do \
- $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar); \
- done
- for F in unoil; do \
- $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
- done
-#
- unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) debug
-
-run:
- adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt
diff --git a/android/experimental/LibreOffice4Android/build.xml b/android/experimental/LibreOffice4Android/build.xml
deleted file mode 100644
index d2e79f7..0000000
--- a/android/experimental/LibreOffice4Android/build.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="LibreOffice4Android" default="help">
-
- <!-- The local.properties file is created and updated by the 'android' tool.
- It contains the path to the SDK. It should *NOT* be checked into
- Version Control Systems. -->
- <loadproperties srcFile="local.properties" />
-
- <!-- The ant.properties file can be created by you. It is only edited by the
- 'android' tool to add properties to it.
- This is the place to change some Ant specific build properties.
- Here are some properties you may want to change/update:
-
- source.dir
- The name of the source directory. Default is 'src'.
- out.dir
- The name of the output directory. Default is 'bin'.
-
- For other overridable properties, look at the beginning of the rules
- files in the SDK, at tools/ant/build.xml
-
- Properties related to the SDK location or the project target should
- be updated using the 'android' tool with the 'update' action.
-
- This file is an integral part of the build system for your
- application and should be checked into Version Control Systems.
-
- -->
- <property file="ant.properties" />
-
- <!-- The project.properties file is created and updated by the 'android'
- tool, as well as ADT.
-
- This contains project specific properties such as project target, and library
- dependencies. Lower level build properties are stored in ant.properties
- (or in .classpath for Eclipse projects).
-
- This file is an integral part of the build system for your
- application and should be checked into Version Control Systems. -->
- <loadproperties srcFile="project.properties" />
-
- <!-- quick check on sdk.dir -->
- <fail
- message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
- unless="sdk.dir"
- />
-
-
-<!-- extension targets. Uncomment the ones where you want to do custom work
- in between standard targets -->
-<!--
- <target name="-pre-build">
- </target>
- <target name="-pre-compile">
- </target>
-
- /* This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir} */
- <target name="-post-compile">
- </target>
--->
-
- <!-- Import the actual build file.
-
- To customize existing targets, there are two options:
- - Customize only one target:
- - copy/paste the target into this file, *before* the
- <import> task.
- - customize it to your needs.
- - Customize the whole content of build.xml
- - copy/paste the content of the rules files (minus the top node)
- into this file, replacing the <import> task.
- - customize to your needs.
-
- ***********************
- ****** IMPORTANT ******
- ***********************
- In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
- in order to avoid having your file be overridden by tools such as "android update project"
- -->
- <!-- version-tag: 1 -->
- <import file="${android.library.reference.1}/no-resource-compress.xml" />
-</project>
diff --git a/android/experimental/LibreOffice4Android/dummies.cxx b/android/experimental/LibreOffice4Android/dummies.cxx
deleted file mode 100644
index 5607ecf..0000000
--- a/android/experimental/LibreOffice4Android/dummies.cxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-// Dummy implementations of the callback functions in the UI layer
-// that the LO layer calls. As this experimental Android app doesn't
-// handle any of that, these do nothing.
-
-#include <android/log.h>
-
-#include <touch/touch.h>
-
-extern "C"
-__attribute__ ((visibility("default")))
-void
-touch_ui_selection_start(MLOSelectionKind kind,
- const void *documentHandle,
- MLORect *rectangles,
- int rectangleCount,
- void *preview)
-{
-}
-
-extern "C"
-__attribute__ ((visibility("default")))
-void
-touch_ui_selection_resize_done(bool success,
- const void *documentHandle,
- MLORect *rectangles,
- int rectangleCount)
-{
-}
-
-extern "C"
-__attribute__ ((visibility("default")))
-void
-touch_ui_selection_none()
-{
-}
-
-
-static const char *
-dialog_kind_to_string(MLODialogKind kind)
-{
- switch (kind) {
- case MLODialogMessage:
- return "MSG";
- case MLODialogInformation:
- return "INF";
- case MLODialogWarning:
- return "WRN";
- case MLODialogError:
- return "ERR";
- case MLODialogQuery:
- return "QRY";
- default:
- return "WTF";
- }
-}
-
-extern "C"
-__attribute__ ((visibility("default")))
-MLODialogResult
-touch_ui_dialog_modal(MLODialogKind kind, const char *message)
-{
- __android_log_print(ANDROID_LOG_INFO, "===> %s: %s", dialog_kind_to_string(kind), message);
- return MLODialogOK;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/experimental/LibreOffice4Android/fonts.conf b/android/experimental/LibreOffice4Android/fonts.conf
deleted file mode 100644
index 263648a..0000000
--- a/android/experimental/LibreOffice4Android/fonts.conf
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/fonts.conf file to configure system font access -->
-<fontconfig>
-
-<!-- Font directory list -->
-
- <dir>/system/fonts</dir>
-
- <alias>
- <family>serif</family>
- <prefer>
- <family>Droid Serif</family>
- </prefer>
- </alias>
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>Roboto</family>
- <family>Droid Sans Fallback</family>
- </prefer>
- </alias>
- <alias>
- <family>monospace</family>
- <prefer>
- <family>Droid Sans Mono</family>
- </prefer>
- </alias>
-
-<!--
- Accept deprecated 'mono' alias, replacing it with 'monospace'
--->
- <match target="pattern">
- <test qual="any" name="family">
- <string>mono</string>
- </test>
- <edit name="family" mode="assign">
- <string>monospace</string>
- </edit>
- </match>
-
-<!--
- Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
--->
- <match target="pattern">
- <test qual="any" name="family">
- <string>sans serif</string>
- </test>
- <edit name="family" mode="assign">
- <string>sans-serif</string>
- </edit>
- </match>
-
-<!--
- Accept deprecated 'sans' alias, replacing it with 'sans-serif'
--->
- <match target="pattern">
- <test qual="any" name="family">
- <string>sans</string>
- </test>
- <edit name="family" mode="assign">
- <string>sans-serif</string>
- </edit>
- </match>
-
-<!--
- Load local system customization file
--->
- <include ignore_missing="yes">conf.d</include>
-
-<!-- Font cache directory list -->
-
- <!-- Yeah this hardcoding is wrong of course, will have to fix
- later to patch in proper code in fontonfig on Android to
- find out a good place.
- -->
- <cachedir>/data/data/org.libreoffice/fontconfig</cachedir>
-
- <config>
-<!--
- These are the default Unicode chars that are expected to be blank
- in fonts. All other blank chars are assumed to be broken and
- won't appear in the resulting charsets
- -->
- <blank>
- <int>0x0020</int> <!-- SPACE -->
- <int>0x00A0</int> <!-- NO-BREAK SPACE -->
- <int>0x00AD</int> <!-- SOFT HYPHEN -->
- <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
- <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
- <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
- <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
- <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
- <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
- <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
- <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
- <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
- <int>0x1680</int> <!-- OGHAM SPACE MARK -->
- <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
- <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
- <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
- <int>0x2000</int> <!-- EN QUAD -->
- <int>0x2001</int> <!-- EM QUAD -->
- <int>0x2002</int> <!-- EN SPACE -->
- <int>0x2003</int> <!-- EM SPACE -->
- <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
- <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
- <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
- <int>0x2007</int> <!-- FIGURE SPACE -->
- <int>0x2008</int> <!-- PUNCTUATION SPACE -->
- <int>0x2009</int> <!-- THIN SPACE -->
- <int>0x200A</int> <!-- HAIR SPACE -->
- <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
- <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
- <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
- <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
- <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
- <int>0x2028</int> <!-- LINE SEPARATOR -->
- <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
- <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
- <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
- <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
- <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
- <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
- <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
- <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
- <int>0x2060</int> <!-- WORD JOINER -->
- <int>0x2061</int> <!-- FUNCTION APPLICATION -->
- <int>0x2062</int> <!-- INVISIBLE TIMES -->
- <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
- <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
- <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
- <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
- <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
- <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
- <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
- <int>0x2800</int> <!-- BRAILLE PATTERN BLANK -->
- <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
- <int>0x3164</int> <!-- HANGUL FILLER -->
- <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
- <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
- <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
- <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
- <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
- </blank>
-<!--
- Rescan configuration every 3600 seconds when FcFontSetList is called
- -->
- <rescan>
- <int>3600</int>
- </rescan>
- </config>
-
-</fontconfig>
diff --git a/android/experimental/LibreOffice4Android/jni/Android.mk b/android/experimental/LibreOffice4Android/jni/Android.mk
deleted file mode 100644
index 939a1ea..0000000
--- a/android/experimental/LibreOffice4Android/jni/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Needed just to satisfy ndk-gdb for now, but maybe later we will actually add
-# some JNI code here
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/android/experimental/LibreOffice4Android/proguard-project.txt b/android/experimental/LibreOffice4Android/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/android/experimental/LibreOffice4Android/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/LibreOffice4Android/project.properties b/android/experimental/LibreOffice4Android/project.properties
deleted file mode 100644
index 501a51d..0000000
--- a/android/experimental/LibreOffice4Android/project.properties
+++ /dev/null
@@ -1,17 +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-15
-
-# Use the Bootstrap class
-android.library.reference.1=../../Bootstrap
-
-# Use the ActionBarSherlock library (Apache licensed)
-android.library.reference.2=../../abs-lib
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_launcher.png b/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 8074c4c..0000000
Binary files a/android/experimental/LibreOffice4Android/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/lo_icon.png b/android/experimental/LibreOffice4Android/res/drawable-hdpi/lo_icon.png
deleted file mode 100644
index 2ef8641..0000000
Binary files a/android/experimental/LibreOffice4Android/res/drawable-hdpi/lo_icon.png and /dev/null differ
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/main.png b/android/experimental/LibreOffice4Android/res/drawable-hdpi/main.png
deleted file mode 100644
index 7e8e2a0..0000000
Binary files a/android/experimental/LibreOffice4Android/res/drawable-hdpi/main.png and /dev/null differ
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/math.png b/android/experimental/LibreOffice4Android/res/drawable-hdpi/math.png
deleted file mode 100644
index 50b8dc8..0000000
Binary files a/android/experimental/LibreOffice4Android/res/drawable-hdpi/math.png and /dev/null differ
diff --git a/android/experimental/LibreOffice4Android/res/drawable-hdpi/startcenter.png b/android/experimental/LibreOffice4Android/res/drawable-hdpi/startcenter.png
deleted file mode 100644
index 7e8e2a0..0000000
Binary files a/android/experimental/LibreOffice4Android/res/drawable-hdpi/startcenter.png and /dev/null differ
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_launcher.png b/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index a07c69f..0000000
Binary files a/android/experimental/LibreOffice4Android/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/experimental/LibreOffice4Android/res/drawable-mdpi/lo_icon.png b/android/experimental/LibreOffice4Android/res/drawable-mdpi/lo_icon.png
deleted file mode 100644
index 4f3f89b..0000000
Binary files a/android/experimental/LibreOffice4Android/res/drawable-mdpi/lo_icon.png and /dev/null differ
diff --git a/android/experimental/LibreOffice4Android/res/values/strings.xml b/android/experimental/LibreOffice4Android/res/values/strings.xml
deleted file mode 100644
index 8951dd4..0000000
--- a/android/experimental/LibreOffice4Android/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/LibreOffice4Android/res/values/styles.xml b/android/experimental/LibreOffice4Android/res/values/styles.xml
deleted file mode 100644
index 39de87b..0000000
--- a/android/experimental/LibreOffice4Android/res/values/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="DocumentViewer" parent="@android:style/Theme.Holo">
- <item name="android:windowActionBarOverlay">true</item>
- <item name="android:windowActionModeOverlay">true</item>
- <item name="android:actionBarStyle">@style/TransparentDarkActionBar</item>
- </style>
-
- <style name="FileExplorer" parent="@android:style/Theme.Holo.Light">
- <item name="android:actionBarStyle">@style/DarkActionBar</item>
- </style>
-
- <style name="TransparentDarkActionBar" parent="@android:style/Widget.Holo.ActionBar">
- <item name="android:background">#bb000000</item>
- </style>
- <style name="DarkActionBar" parent="@android:style/Widget.Holo.ActionBar">
- <item name="android:background">#ff333333</item>
- <item name="android:textColor">#dddddd</item>
- </style>
-
- <style name="grayBackground">
- <item name="android:background">#dd000000</item>
- </style>
-</resources>
\ No newline at end of file
More information about the Libreoffice-commits
mailing list