Android: merge LibreOffice4Android into LOAndroid3

Desktop / LibreOffice - Jacobo Aragunde Pérez [igalia.com] - 18 September 2014 15:52 UTC

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

71832a5 Android: merge LibreOffice4Android into LOAndroid3
android/CustomTarget_android_desktop.mk | 14 +-
android/CustomTarget_lo4android.mk | 36 -
android/Module_android.mk | 1 -
.../experimental/LOAndroid3/AndroidManifest.xml | 9 +
.../LOAndroid3/res/drawable-hdpi/action_search.png | Bin 0 -> 1759 bytes
.../res/drawable-hdpi/action_search_light.png | Bin 0 -> 1764 bytes
.../res/drawable-hdpi/bg_striped_img.png | Bin 0 -> 156 bytes
.../res/drawable-hdpi/bg_striped_split_img.png | Bin 0 -> 151 bytes
.../LOAndroid3/res/drawable-hdpi/ic_compose.png | Bin 0 -> 1390 bytes
.../res/drawable-hdpi/ic_compose_inverse.png | Bin 0 -> 647 bytes
.../res/drawable-hdpi/ic_launcher_settings.png | Bin 0 -> 7230 bytes
.../res/drawable-hdpi/ic_magnifying_glass.png | Bin 0 -> 5093 bytes
.../LOAndroid3/res/drawable-hdpi/ic_refresh.png | Bin 0 -> 683 bytes
.../res/drawable-hdpi/ic_refresh_inverse.png | Bin 0 -> 797 bytes
.../LOAndroid3/res/drawable-hdpi/ic_search.png | Bin 0 -> 641 bytes
.../res/drawable-hdpi/ic_search_inverse.png | Bin 0 -> 759 bytes
.../res/drawable-hdpi/ic_title_share_default.png | Bin 0 -> 641 bytes
.../LOAndroid3/res/drawable-hdpi/icon.png | Bin 0 -> 6996 bytes
.../res/drawable-hdpi/light_sort_by_size.png | Bin 0 -> 1141 bytes
.../res/drawable-hdpi/light_view_as_grid.png | Bin 0 -> 1286 bytes
.../res/drawable-hdpi/light_view_as_list.png | Bin 0 -> 1363 bytes
.../LOAndroid3/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 1723 bytes
.../LOAndroid3/res/drawable-ldpi/icon.png | Bin 0 -> 3003 bytes
.../LOAndroid3/res/drawable-ldpi/lo_icon.png | Bin 0 -> 2773 bytes
.../res/drawable-mdpi/bg_striped_img.png | Bin 0 -> 141 bytes
.../res/drawable-mdpi/bg_striped_split_img.png | Bin 0 -> 136 bytes
.../LOAndroid3/res/drawable-mdpi/ic_compose.png | Bin 0 -> 1327 bytes
.../res/drawable-mdpi/ic_compose_inverse.png | Bin 0 -> 578 bytes
.../res/drawable-mdpi/ic_launcher_settings.png | Bin 0 -> 4122 bytes
.../res/drawable-mdpi/ic_magnifying_glass.png | Bin 0 -> 2631 bytes
.../LOAndroid3/res/drawable-mdpi/ic_refresh.png | Bin 0 -> 1392 bytes
.../res/drawable-mdpi/ic_refresh_inverse.png | Bin 0 -> 659 bytes
.../LOAndroid3/res/drawable-mdpi/ic_search.png | Bin 0 -> 1330 bytes
.../res/drawable-mdpi/ic_search_inverse.png | Bin 0 -> 616 bytes
.../LOAndroid3/res/drawable-mdpi/icon.png | Bin 0 -> 4248 bytes
.../res/drawable-xhdpi/bg_striped_img.png | Bin 0 -> 169 bytes
.../res/drawable-xhdpi/bg_striped_split_img.png | Bin 0 -> 164 bytes
.../res/drawable-xhdpi/ic_launcher_settings.png | Bin 0 -> 11183 bytes
.../LOAndroid3/res/drawable-xhdpi/icon.png | Bin 0 -> 10322 bytes
.../experimental/LOAndroid3/res/drawable/base.png | Bin 0 -> 20684 bytes
.../LOAndroid3/res/drawable/bg_striped.xml | 6 +
.../LOAndroid3/res/drawable/bg_striped_split.xml | 6 +
.../res/drawable/black_white_gradient.xml | 15 +
.../experimental/LOAndroid3/res/drawable/calc.png | Bin 0 -> 20697 bytes
.../experimental/LOAndroid3/res/drawable/draw.png | Bin 0 -> 18445 bytes
.../LOAndroid3/res/drawable/dummy_page.png | Bin 0 -> 77517 bytes
.../LOAndroid3/res/drawable/folder.png | Bin 0 -> 17650 bytes
.../LOAndroid3/res/drawable/impress.png | Bin 0 -> 13936 bytes
.../LOAndroid3/res/drawable/writer.png | Bin 0 -> 19535 bytes
.../LOAndroid3/res/layout/document_viewer.xml | 33 +
.../res/layout/file_explorer_folder_icon.xml | 35 +
.../res/layout/file_explorer_grid_item.xml | 36 +
.../LOAndroid3/res/layout/file_grid.xml | 27 +
.../LOAndroid3/res/layout/file_list.xml | 20 +
.../LOAndroid3/res/layout/file_list_item.xml | 47 +
.../experimental/LOAndroid3/res/layout/main.xml | 22 +
.../LOAndroid3/res/layout/navigation_grid_item.xml | 23 +
.../experimental/LOAndroid3/res/menu/view_menu.xml | 16 +
.../experimental/LOAndroid3/res/values/arrays.xml | 56 +
.../experimental/LOAndroid3/res/values/strings.xml | 11 +
.../LOAndroid3/res/xml/libreoffice_preferences.xml | 21 +
.../src/java/com/polites/android/Animation.java | 28 +
.../src/java/com/polites/android/Animator.java | 91 ++
.../java/com/polites/android/FlingAnimation.java | 70 ++
.../polites/android/FlingAnimationListener.java | 24 +
.../java/com/polites/android/FlingListener.java | 40 +
.../java/com/polites/android/GestureImageView.java | 712 +++++++++++
.../polites/android/GestureImageViewListener.java | 26 +
.../android/GestureImageViewTouchListener.java | 540 +++++++++
.../src/java/com/polites/android/MathUtils.java | 76 ++
.../java/com/polites/android/MoveAnimation.java | 102 ++
.../com/polites/android/MoveAnimationListener.java | 22 +
.../src/java/com/polites/android/VectorF.java | 63 +
.../java/com/polites/android/ZoomAnimation.java | 162 +++
.../com/polites/android/ZoomAnimationListener.java | 21 +
.../org/libreoffice/android/DocumentLoader.java | 1257 ++++++++++++++++++++
.../src/java/org/libreoffice/ui/FileUtilities.java | 229 ++++
.../java/org/libreoffice/ui/FolderIconView.java | 197 +++
.../java/org/libreoffice/ui/GridItemAdapter.java | 147 +++
.../org/libreoffice/ui/LibreOfficeUIActivity.java | 953 +++++++++++++++
.../java/org/libreoffice/ui/ListItemAdapter.java | 168 +++
.../src/java/org/libreoffice/ui/PageView.java | 65 +
.../java/org/libreoffice/ui/PreferenceEditor.java | 27 +
.../org/libreoffice/ui/WriterViewerActivity.java | 47 +
.../LibreOffice4Android/AndroidManifest.xml | 42 -
android/experimental/LibreOffice4Android/Makefile | 38 -
android/experimental/LibreOffice4Android/build.xml | 84 --
.../experimental/LibreOffice4Android/dummies.cxx | 75 --
.../experimental/LibreOffice4Android/fonts.conf | 154 ---
.../LibreOffice4Android/jni/Android.mk | 8 -
.../LibreOffice4Android/proguard-project.txt | 20 -
.../LibreOffice4Android/project.properties | 17 -
.../res/drawable-hdpi/action_search.png | Bin 1759 -> 0 bytes
.../res/drawable-hdpi/action_search_light.png | Bin 1764 -> 0 bytes
.../res/drawable-hdpi/bg_striped_img.png | Bin 156 -> 0 bytes
.../res/drawable-hdpi/bg_striped_split_img.png | Bin 151 -> 0 bytes
.../res/drawable-hdpi/ic_compose.png | Bin 1390 -> 0 bytes
.../res/drawable-hdpi/ic_compose_inverse.png | Bin 647 -> 0 bytes
.../res/drawable-hdpi/ic_launcher.png | Bin 4147 -> 0 bytes
.../res/drawable-hdpi/ic_launcher_settings.png | Bin 7230 -> 0 bytes
.../res/drawable-hdpi/ic_magnifying_glass.png | Bin 5093 -> 0 bytes
.../res/drawable-hdpi/ic_refresh.png | Bin 683 -> 0 bytes
.../res/drawable-hdpi/ic_refresh_inverse.png | Bin 797 -> 0 bytes
.../res/drawable-hdpi/ic_search.png | Bin 641 -> 0 bytes
.../res/drawable-hdpi/ic_search_inverse.png | Bin 759 -> 0 bytes
.../res/drawable-hdpi/ic_title_share_default.png | Bin 641 -> 0 bytes
.../LibreOffice4Android/res/drawable-hdpi/icon.png | Bin 6996 -> 0 bytes
.../res/drawable-hdpi/light_sort_by_size.png | Bin 1141 -> 0 bytes
.../res/drawable-hdpi/light_view_as_grid.png | Bin 1286 -> 0 bytes
.../res/drawable-hdpi/light_view_as_list.png | Bin 1363 -> 0 bytes
.../res/drawable-hdpi/lo_icon.png | Bin 4475 -> 0 bytes
.../LibreOffice4Android/res/drawable-hdpi/main.png | Bin 4380 -> 0 bytes
.../LibreOffice4Android/res/drawable-hdpi/math.png | Bin 15370 -> 0 bytes
.../res/drawable-hdpi/startcenter.png | Bin 4380 -> 0 bytes
.../res/drawable-ldpi/ic_launcher.png | Bin 1723 -> 0 bytes
.../LibreOffice4Android/res/drawable-ldpi/icon.png | Bin 3003 -> 0 bytes
.../res/drawable-ldpi/lo_icon.png | Bin 2773 -> 0 bytes
.../res/drawable-mdpi/bg_striped_img.png | Bin 141 -> 0 bytes
.../res/drawable-mdpi/bg_striped_split_img.png | Bin 136 -> 0 bytes
.../res/drawable-mdpi/ic_compose.png | Bin 1327 -> 0 bytes
.../res/drawable-mdpi/ic_compose_inverse.png | Bin 578 -> 0 bytes
.../res/drawable-mdpi/ic_launcher.png | Bin 2574 -> 0 bytes
.../res/drawable-mdpi/ic_launcher_settings.png | Bin 4122 -> 0 bytes
.../res/drawable-mdpi/ic_magnifying_glass.png | Bin 2631 -> 0 bytes
.../res/drawable-mdpi/ic_refresh.png | Bin 1392 -> 0 bytes
.../res/drawable-mdpi/ic_refresh_inverse.png | Bin 659 -> 0 bytes
.../res/drawable-mdpi/ic_search.png | Bin 1330 -> 0 bytes
.../res/drawable-mdpi/ic_search_inverse.png | Bin 616 -> 0 bytes
.../LibreOffice4Android/res/drawable-mdpi/icon.png | Bin 4248 -> 0 bytes
.../res/drawable-mdpi/lo_icon.png | Bin 3255 -> 0 bytes
.../res/drawable-xhdpi/bg_striped_img.png | Bin 169 -> 0 bytes
.../res/drawable-xhdpi/bg_striped_split_img.png | Bin 164 -> 0 bytes
.../res/drawable-xhdpi/ic_launcher_settings.png | Bin 11183 -> 0 bytes
.../res/drawable-xhdpi/icon.png | Bin 10322 -> 0 bytes
.../LibreOffice4Android/res/drawable/base.png | Bin 20684 -> 0 bytes
.../res/drawable/bg_striped.xml | 6 -
.../res/drawable/bg_striped_split.xml | 6 -
.../res/drawable/black_white_gradient.xml | 15 -
.../LibreOffice4Android/res/drawable/calc.png | Bin 20697 -> 0 bytes
.../LibreOffice4Android/res/drawable/draw.png | Bin 18445 -> 0 bytes
.../res/drawable/dummy_page.png | Bin 77517 -> 0 bytes
.../LibreOffice4Android/res/drawable/folder.png | Bin 17650 -> 0 bytes
.../LibreOffice4Android/res/drawable/impress.png | Bin 13936 -> 0 bytes
.../LibreOffice4Android/res/drawable/writer.png | Bin 19535 -> 0 bytes
.../res/layout/document_viewer.xml | 33 -
.../res/layout/file_explorer_folder_icon.xml | 35 -
.../res/layout/file_explorer_grid_item.xml | 36 -
.../LibreOffice4Android/res/layout/file_grid.xml | 27 -
.../LibreOffice4Android/res/layout/file_list.xml | 20 -
.../res/layout/file_list_item.xml | 47 -
.../LibreOffice4Android/res/layout/main.xml | 22 -
.../res/layout/navigation_grid_item.xml | 23 -
.../LibreOffice4Android/res/menu/view_menu.xml | 16 -
.../LibreOffice4Android/res/values/arrays.xml | 56 -
.../LibreOffice4Android/res/values/strings.xml | 16 -
.../LibreOffice4Android/res/values/styles.xml | 24 -
.../res/xml/libreoffice_preferences.xml | 21 -
.../src/com/polites/android/Animation.java | 28 -
.../src/com/polites/android/Animator.java | 91 --
.../src/com/polites/android/FlingAnimation.java | 70 --
.../polites/android/FlingAnimationListener.java | 24 -
.../src/com/polites/android/FlingListener.java | 40 -
.../src/com/polites/android/GestureImageView.java | 712 -----------
.../polites/android/GestureImageViewListener.java | 26 -
.../android/GestureImageViewTouchListener.java | 540 ---------
.../src/com/polites/android/MathUtils.java | 76 --
.../src/com/polites/android/MoveAnimation.java | 102 --
.../com/polites/android/MoveAnimationListener.java | 22 -
.../src/com/polites/android/VectorF.java | 63 -
.../src/com/polites/android/ZoomAnimation.java | 162 ---
.../com/polites/android/ZoomAnimationListener.java | 21 -
.../org/libreoffice/android/DocumentLoader.java | 1257 --------------------
.../src/org/libreoffice/ui/FileUtilities.java | 229 ----
.../src/org/libreoffice/ui/FolderIconView.java | 197 ---
.../src/org/libreoffice/ui/GridItemAdapter.java | 147 ---
.../org/libreoffice/ui/LibreOfficeUIActivity.java | 953 ---------------
.../src/org/libreoffice/ui/ListItemAdapter.java | 168 ---
.../src/org/libreoffice/ui/PageView.java | 65 -
.../src/org/libreoffice/ui/PreferenceEditor.java | 27 -
.../org/libreoffice/ui/WriterViewerActivity.java | 47 -
180 files changed, 5456 insertions(+), 5953 deletions(-)

Upstream: cgit.freedesktop.org

  • Share