android/Bootstrap/Makefile.shared | 4 android/CustomTarget_lo_android.mk | 8 android/experimental/LOAndroid3/AndroidManifest.xml.in | 112 - android/experimental/LOAndroid3/Makefile | 42 android/experimental/LOAndroid3/build.xml | 84 android/experimental/LOAndroid3/fonts.conf | 154 - android/experimental/LOAndroid3/jni/Android.mk | 8 android/experimental/LOAndroid3/proguard-project.txt | 20 android/experimental/LOAndroid3/project.properties | 15 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/handle_end_level.xml | 14 android/experimental/LOAndroid3/res/drawable/handle_start_level.xml | 14 android/experimental/LOAndroid3/res/layout/about.xml | 47 android/experimental/LOAndroid3/res/layout/activity_document_browser.xml | 36 android/experimental/LOAndroid3/res/layout/activity_main.xml | 65 android/experimental/LOAndroid3/res/layout/document_part_list_layout.xml | 20 android/experimental/LOAndroid3/res/layout/document_viewer.xml | 33 android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml | 37 android/experimental/LOAndroid3/res/layout/file_grid.xml | 25 android/experimental/LOAndroid3/res/layout/file_list.xml | 20 android/experimental/LOAndroid3/res/layout/file_list_item.xml | 41 android/experimental/LOAndroid3/res/layout/item_in_drawer.xml | 17 android/experimental/LOAndroid3/res/layout/main.xml | 22 android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml | 23 android/experimental/LOAndroid3/res/layout/text_selection_handles.xml | 14 android/experimental/LOAndroid3/res/layout/toolbar.xml | 10 android/experimental/LOAndroid3/res/menu/context_menu.xml | 7 android/experimental/LOAndroid3/res/menu/main.xml | 54 android/experimental/LOAndroid3/res/menu/view_menu.xml | 19 android/experimental/LOAndroid3/res/values-v21/themes.xml | 18 android/experimental/LOAndroid3/res/values/arrays.xml | 59 android/experimental/LOAndroid3/res/values/attrs.xml | 17 android/experimental/LOAndroid3/res/values/colors.xml | 95 android/experimental/LOAndroid3/res/values/dimens.xml | 8 android/experimental/LOAndroid3/res/values/ids.xml | 4 android/experimental/LOAndroid3/res/values/strings.xml | 59 android/experimental/LOAndroid3/res/values/themes.xml | 17 android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml | 32 android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java | 21 android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java | 51 android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java | 456 ---- android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java | 113 - android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java | 118 - android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitInputConnectionHandler.java | 75 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java | 176 - android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 343 --- android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 510 ---- android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 393 --- android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java | 159 - android/experimental/LOAndroid3/src/java/org/libreoffice/SettingsActivity.java | 37 android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java | 121 - android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java | 92 android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java | 149 - android/experimental/LOAndroid3/src/java/org/libreoffice/TileProviderFactory.java | 43 android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java | 139 - android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/BitmapHandle.java | 61 android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java | 45 android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java | 25 android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java | 49 android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/Cursor.java | 56 android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java | 292 -- android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java | 146 - android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/ImageUtils.java | 24 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/DocumentOverlay.java | 210 - android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlayView.java | 389 --- android/experimental/LOAndroid3/src/java/org/libreoffice/storage/DocumentProviderFactory.java | 100 android/experimental/LOAndroid3/src/java/org/libreoffice/storage/IDocumentProvider.java | 46 android/experimental/LOAndroid3/src/java/org/libreoffice/storage/IFile.java | 105 android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java | 39 android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsProvider.java | 40 android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalFile.java | 96 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java | 283 -- android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java | 211 - android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java | 131 - android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 754 ------- android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java | 69 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java | 50 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnInterceptTouchListener.java | 14 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java | 94 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java | 42 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Axis.java | 337 --- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java | 83 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java | 35 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoImage.java | 28 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoUtils.java | 51 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java | 287 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java | 751 ------- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java | 67 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java | 30 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java | 31 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java | 53 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLController.java | 275 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 359 --- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java | 237 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java | 15 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/IntSize.java | 73 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 1066 ---------- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java | 218 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 520 ---- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java | 458 ---- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java | 131 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomController.java | 40 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java | 26 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java | 51 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RectUtils.java | 111 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java | 148 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java | 453 ---- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java | 322 --- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java | 154 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java | 256 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java | 78 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextLayer.java | 69 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java | 77 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java | 53 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java | 176 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java | 306 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java | 173 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java | 41 android/source/AndroidManifest.xml.in | 112 + android/source/Makefile | 42 android/source/build.xml | 84 android/source/fonts.conf | 154 + android/source/jni/Android.mk | 8 android/source/proguard-project.txt | 20 android/source/project.properties | 15 android/source/res/drawable-hdpi/action_bold.png |binary android/source/res/drawable-hdpi/action_italic.png |binary android/source/res/drawable-hdpi/action_search.png |binary android/source/res/drawable-hdpi/action_search_light.png |binary android/source/res/drawable-hdpi/action_strikeout.png |binary android/source/res/drawable-hdpi/action_underline.png |binary android/source/res/drawable-hdpi/bg_striped_img.png |binary android/source/res/drawable-hdpi/bg_striped_split_img.png |binary android/source/res/drawable-hdpi/handle_end.png |binary android/source/res/drawable-hdpi/handle_middle.png |binary android/source/res/drawable-hdpi/handle_start.png |binary android/source/res/drawable-hdpi/light_view_as_grid.png |binary android/source/res/drawable-hdpi/light_view_as_list.png |binary android/source/res/drawable-hdpi/lo_icon.png |binary android/source/res/drawable-hdpi/main.png |binary android/source/res/drawable-ldpi/lo_icon.png |binary android/source/res/drawable-mdpi/action_bold.png |binary android/source/res/drawable-mdpi/action_italic.png |binary android/source/res/drawable-mdpi/action_strikeout.png |binary android/source/res/drawable-mdpi/action_underline.png |binary android/source/res/drawable-mdpi/background.png |binary android/source/res/drawable-mdpi/bg_striped_img.png |binary android/source/res/drawable-mdpi/bg_striped_split_img.png |binary android/source/res/drawable-mdpi/lo_icon.png |binary android/source/res/drawable-mdpi/shadow.png |binary android/source/res/drawable-xhdpi/action_bold.png |binary android/source/res/drawable-xhdpi/action_italic.png |binary android/source/res/drawable-xhdpi/action_strikeout.png |binary android/source/res/drawable-xhdpi/action_underline.png |binary android/source/res/drawable-xhdpi/bg_striped_img.png |binary android/source/res/drawable-xhdpi/bg_striped_split_img.png |binary android/source/res/drawable-xhdpi/handle_end.png |binary android/source/res/drawable-xhdpi/handle_middle.png |binary android/source/res/drawable-xhdpi/handle_start.png |binary android/source/res/drawable-xxxhdpi/action_bold.png |binary android/source/res/drawable-xxxhdpi/action_italic.png |binary android/source/res/drawable-xxxhdpi/action_strikeout.png |binary android/source/res/drawable-xxxhdpi/action_underline.png |binary android/source/res/drawable-xxxhdpi/ic_check_grey600_24dp.png |binary android/source/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png |binary android/source/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png |binary android/source/res/drawable/bg_striped.xml | 6 android/source/res/drawable/bg_striped_split.xml | 6 android/source/res/drawable/black_white_gradient.xml | 15 android/source/res/drawable/calc.png |binary android/source/res/drawable/draw.png |binary android/source/res/drawable/dummy_page.png |binary android/source/res/drawable/folder.png |binary android/source/res/drawable/handle_end.png |binary android/source/res/drawable/handle_end_level.xml | 14 android/source/res/drawable/handle_graphic.png |binary android/source/res/drawable/handle_middle.png |binary android/source/res/drawable/handle_start.png |binary android/source/res/drawable/handle_start_level.xml | 14 android/source/res/drawable/impress.png |binary android/source/res/drawable/writer.png |binary android/source/res/layout/about.xml | 47 android/source/res/layout/activity_document_browser.xml | 36 android/source/res/layout/activity_main.xml | 65 android/source/res/layout/document_part_list_layout.xml | 20 android/source/res/layout/document_viewer.xml | 33 android/source/res/layout/file_explorer_grid_item.xml | 37 android/source/res/layout/file_grid.xml | 25 android/source/res/layout/file_list.xml | 20 android/source/res/layout/file_list_item.xml | 41 android/source/res/layout/item_in_drawer.xml | 17 android/source/res/layout/main.xml | 22 android/source/res/layout/navigation_grid_item.xml | 23 android/source/res/layout/text_selection_handles.xml | 14 android/source/res/layout/toolbar.xml | 10 android/source/res/menu/context_menu.xml | 7 android/source/res/menu/main.xml | 54 android/source/res/menu/view_menu.xml | 19 android/source/res/values-v21/themes.xml | 18 android/source/res/values/arrays.xml | 59 android/source/res/values/attrs.xml | 17 android/source/res/values/colors.xml | 95 android/source/res/values/dimens.xml | 8 android/source/res/values/ids.xml | 4 android/source/res/values/strings.xml | 59 android/source/res/values/themes.xml | 17 android/source/res/xml/libreoffice_preferences.xml | 32 android/source/src/java/org/libreoffice/DocumentPartView.java | 21 android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java | 51 android/source/src/java/org/libreoffice/InvalidationHandler.java | 456 ++++ android/source/src/java/org/libreoffice/LOAbout.java | 113 + android/source/src/java/org/libreoffice/LOEvent.java | 118 + android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java | 75 android/source/src/java/org/libreoffice/LOKitShell.java | 176 + android/source/src/java/org/libreoffice/LOKitThread.java | 343 +++ android/source/src/java/org/libreoffice/LOKitTileProvider.java | 510 ++++ android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 393 +++ android/source/src/java/org/libreoffice/MockTileProvider.java | 159 + android/source/src/java/org/libreoffice/SettingsActivity.java | 37 android/source/src/java/org/libreoffice/ThumbnailCreator.java | 121 + android/source/src/java/org/libreoffice/TileIdentifier.java | 92 android/source/src/java/org/libreoffice/TileProvider.java | 149 + android/source/src/java/org/libreoffice/TileProviderFactory.java | 43 android/source/src/java/org/libreoffice/ToolbarController.java | 139 + android/source/src/java/org/libreoffice/canvas/BitmapHandle.java | 61 android/source/src/java/org/libreoffice/canvas/CanvasElement.java | 45 android/source/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java | 25 android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java | 49 android/source/src/java/org/libreoffice/canvas/Cursor.java | 56 android/source/src/java/org/libreoffice/canvas/GraphicSelection.java | 292 ++ android/source/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java | 146 + android/source/src/java/org/libreoffice/canvas/ImageUtils.java | 24 android/source/src/java/org/libreoffice/canvas/SelectionHandle.java | 69 android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java | 23 android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java | 35 android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java | 35 android/source/src/java/org/libreoffice/overlay/DocumentOverlay.java | 210 + android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java | 389 +++ android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java | 100 android/source/src/java/org/libreoffice/storage/IDocumentProvider.java | 46 android/source/src/java/org/libreoffice/storage/IFile.java | 105 android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java | 39 android/source/src/java/org/libreoffice/storage/local/LocalDocumentsProvider.java | 40 android/source/src/java/org/libreoffice/storage/local/LocalFile.java | 96 android/source/src/java/org/libreoffice/ui/FileUtilities.java | 283 ++ android/source/src/java/org/libreoffice/ui/FolderIconView.java | 211 + android/source/src/java/org/libreoffice/ui/GridItemAdapter.java | 131 + android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 754 +++++++ android/source/src/java/org/libreoffice/ui/PageView.java | 69 android/source/src/java/org/libreoffice/ui/WriterViewerActivity.java | 50 android/source/src/java/org/mozilla/gecko/OnInterceptTouchListener.java | 14 android/source/src/java/org/mozilla/gecko/OnSlideSwipeListener.java | 94 android/source/src/java/org/mozilla/gecko/ZoomConstraints.java | 42 android/source/src/java/org/mozilla/gecko/gfx/Axis.java | 337 +++ android/source/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java | 83 android/source/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java | 35 android/source/src/java/org/mozilla/gecko/gfx/CairoImage.java | 28 android/source/src/java/org/mozilla/gecko/gfx/CairoUtils.java | 51 android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java | 287 ++ android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java | 751 +++++++ android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java | 67 android/source/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java | 30 android/source/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java | 31 android/source/src/java/org/mozilla/gecko/gfx/FloatSize.java | 53 android/source/src/java/org/mozilla/gecko/gfx/GLController.java | 275 ++ android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 359 +++ android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java | 237 ++ android/source/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java | 15 android/source/src/java/org/mozilla/gecko/gfx/IntSize.java | 73 android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 1066 ++++++++++ android/source/src/java/org/mozilla/gecko/gfx/Layer.java | 218 ++ android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 520 ++++ android/source/src/java/org/mozilla/gecko/gfx/LayerView.java | 458 ++++ android/source/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java | 131 + android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java | 40 android/source/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java | 26 android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java | 51 android/source/src/java/org/mozilla/gecko/gfx/RectUtils.java | 111 + android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java | 148 + android/source/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java | 453 ++++ android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java | 322 +++ android/source/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java | 154 + android/source/src/java/org/mozilla/gecko/gfx/SubTile.java | 256 ++ android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java | 78 android/source/src/java/org/mozilla/gecko/gfx/TextLayer.java | 69 android/source/src/java/org/mozilla/gecko/gfx/TextureGenerator.java | 77 android/source/src/java/org/mozilla/gecko/gfx/TextureReaper.java | 53 android/source/src/java/org/mozilla/gecko/gfx/TileLayer.java | 176 + android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java | 306 ++ android/source/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java | 173 + android/source/src/java/org/mozilla/gecko/util/FloatUtils.java | 41 dev/null |binary 298 files changed, 15463 insertions(+), 15463 deletions(-)
New commits: commit ab8cbb6cc121f7001a920f9d9f12cd9ccddec385 Author: Tor Lillqvist <t...@collabora.com> Date: Thu May 21 17:01:09 2015 +0100 Let's simplify the paths and be less 'experimental' diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index e9296df..84c6881 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -59,7 +59,7 @@ prepare-appcompat: properties: echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties - echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties + echo sdk.dir=$(ANDROID_SDK_HOME) >../Bootstrap/local.properties echo "# File needed by ndk-gdb" >jni/Application.mk echo "APP_ABI := $(ANDROID_APP_ABI)" > jni/Application.mk echo "APP_PLATFORM := android-21" >> jni/Application.mk @@ -100,7 +100,7 @@ WHOLELIBS = \ $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS) mkdir -p $(OBJLOCAL) - $(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz + $(CXX) -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so mkdir -p $(SODEST) diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 24225c0..37f3012 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -8,22 +8,22 @@ $(eval $(call gb_CustomTarget_CustomTarget,android/loandroid3)) -loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LOAndroid3) +loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/source) $(call gb_CustomTarget_get_target,android/loandroid3) : \ $(loandroid3_DIR)/done $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) - cd $(SRCDIR)/android/experimental/LOAndroid3 && $(MAKE) all + cd $(SRCDIR)/android/source && $(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. # Us "foo" instead of the old INPATH mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ - cp $(SRCDIR)/android/experimental/LOAndroid3/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin + cp $(SRCDIR)/android/source/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin $(call gb_CustomTarget_get_clean_target,android/loandroid3) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) - cd $(SRCDIR)/android/experimental/LOAndroid3 && $(MAKE) clean + cd $(SRCDIR)/android/source && $(MAKE) clean # vim: set noet sw=4 ts=4: diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/source/AndroidManifest.xml.in similarity index 100% rename from android/experimental/LOAndroid3/AndroidManifest.xml.in rename to android/source/AndroidManifest.xml.in diff --git a/android/experimental/LOAndroid3/Makefile b/android/source/Makefile similarity index 97% rename from android/experimental/LOAndroid3/Makefile rename to android/source/Makefile index 346b995..3bf2c15 100644 --- a/android/experimental/LOAndroid3/Makefile +++ b/android/source/Makefile @@ -12,7 +12,7 @@ all: build-ant APP_PACKAGE=org.libreoffice DISABLE_UI=TRUE -BOOTSTRAPDIR=../../Bootstrap +BOOTSTRAPDIR=../Bootstrap include $(BOOTSTRAPDIR)/Makefile.shared native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py diff --git a/android/experimental/LOAndroid3/build.xml b/android/source/build.xml similarity index 100% rename from android/experimental/LOAndroid3/build.xml rename to android/source/build.xml diff --git a/android/experimental/LOAndroid3/fonts.conf b/android/source/fonts.conf similarity index 100% rename from android/experimental/LOAndroid3/fonts.conf rename to android/source/fonts.conf diff --git a/android/experimental/LOAndroid3/jni/Android.mk b/android/source/jni/Android.mk similarity index 100% rename from android/experimental/LOAndroid3/jni/Android.mk rename to android/source/jni/Android.mk diff --git a/android/experimental/LOAndroid3/proguard-project.txt b/android/source/proguard-project.txt similarity index 100% rename from android/experimental/LOAndroid3/proguard-project.txt rename to android/source/proguard-project.txt diff --git a/android/experimental/LOAndroid3/project.properties b/android/source/project.properties similarity index 81% rename from android/experimental/LOAndroid3/project.properties rename to android/source/project.properties index d5ae53d..3580b11 100644 --- a/android/experimental/LOAndroid3/project.properties +++ b/android/source/project.properties @@ -11,5 +11,5 @@ target=android-21 # Use the Bootstrap class -android.library.reference.1=../../Bootstrap -android.library.reference.2=../../AppCompat-v7 +android.library.reference.1=../Bootstrap +android.library.reference.2=../AppCompat-v7 diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png b/android/source/res/drawable-hdpi/action_bold.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png rename to android/source/res/drawable-hdpi/action_bold.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png b/android/source/res/drawable-hdpi/action_italic.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png rename to android/source/res/drawable-hdpi/action_italic.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_search.png b/android/source/res/drawable-hdpi/action_search.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/action_search.png rename to android/source/res/drawable-hdpi/action_search.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_search_light.png b/android/source/res/drawable-hdpi/action_search_light.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/action_search_light.png rename to android/source/res/drawable-hdpi/action_search_light.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png b/android/source/res/drawable-hdpi/action_strikeout.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png rename to android/source/res/drawable-hdpi/action_strikeout.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png b/android/source/res/drawable-hdpi/action_underline.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png rename to android/source/res/drawable-hdpi/action_underline.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_img.png b/android/source/res/drawable-hdpi/bg_striped_img.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_img.png rename to android/source/res/drawable-hdpi/bg_striped_img.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_split_img.png b/android/source/res/drawable-hdpi/bg_striped_split_img.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_split_img.png rename to android/source/res/drawable-hdpi/bg_striped_split_img.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/handle_end.png b/android/source/res/drawable-hdpi/handle_end.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/handle_end.png rename to android/source/res/drawable-hdpi/handle_end.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png b/android/source/res/drawable-hdpi/handle_middle.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png rename to android/source/res/drawable-hdpi/handle_middle.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/handle_start.png b/android/source/res/drawable-hdpi/handle_start.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/handle_start.png rename to android/source/res/drawable-hdpi/handle_start.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_grid.png b/android/source/res/drawable-hdpi/light_view_as_grid.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_grid.png rename to android/source/res/drawable-hdpi/light_view_as_grid.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_list.png b/android/source/res/drawable-hdpi/light_view_as_list.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_list.png rename to android/source/res/drawable-hdpi/light_view_as_list.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/lo_icon.png b/android/source/res/drawable-hdpi/lo_icon.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/lo_icon.png rename to android/source/res/drawable-hdpi/lo_icon.png diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/main.png b/android/source/res/drawable-hdpi/main.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-hdpi/main.png rename to android/source/res/drawable-hdpi/main.png diff --git a/android/experimental/LOAndroid3/res/drawable-ldpi/lo_icon.png b/android/source/res/drawable-ldpi/lo_icon.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-ldpi/lo_icon.png rename to android/source/res/drawable-ldpi/lo_icon.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png b/android/source/res/drawable-mdpi/action_bold.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png rename to android/source/res/drawable-mdpi/action_bold.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png b/android/source/res/drawable-mdpi/action_italic.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png rename to android/source/res/drawable-mdpi/action_italic.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png b/android/source/res/drawable-mdpi/action_strikeout.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png rename to android/source/res/drawable-mdpi/action_strikeout.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png b/android/source/res/drawable-mdpi/action_underline.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png rename to android/source/res/drawable-mdpi/action_underline.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/background.png b/android/source/res/drawable-mdpi/background.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/background.png rename to android/source/res/drawable-mdpi/background.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_img.png b/android/source/res/drawable-mdpi/bg_striped_img.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_img.png rename to android/source/res/drawable-mdpi/bg_striped_img.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_split_img.png b/android/source/res/drawable-mdpi/bg_striped_split_img.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_split_img.png rename to android/source/res/drawable-mdpi/bg_striped_split_img.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/lo_icon.png b/android/source/res/drawable-mdpi/lo_icon.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/lo_icon.png rename to android/source/res/drawable-mdpi/lo_icon.png diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/shadow.png b/android/source/res/drawable-mdpi/shadow.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-mdpi/shadow.png rename to android/source/res/drawable-mdpi/shadow.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png b/android/source/res/drawable-xhdpi/action_bold.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png rename to android/source/res/drawable-xhdpi/action_bold.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png b/android/source/res/drawable-xhdpi/action_italic.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png rename to android/source/res/drawable-xhdpi/action_italic.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png b/android/source/res/drawable-xhdpi/action_strikeout.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png rename to android/source/res/drawable-xhdpi/action_strikeout.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png b/android/source/res/drawable-xhdpi/action_underline.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png rename to android/source/res/drawable-xhdpi/action_underline.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_img.png b/android/source/res/drawable-xhdpi/bg_striped_img.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_img.png rename to android/source/res/drawable-xhdpi/bg_striped_img.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_split_img.png b/android/source/res/drawable-xhdpi/bg_striped_split_img.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_split_img.png rename to android/source/res/drawable-xhdpi/bg_striped_split_img.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png b/android/source/res/drawable-xhdpi/handle_end.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png rename to android/source/res/drawable-xhdpi/handle_end.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png b/android/source/res/drawable-xhdpi/handle_middle.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png rename to android/source/res/drawable-xhdpi/handle_middle.png diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_start.png b/android/source/res/drawable-xhdpi/handle_start.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xhdpi/handle_start.png rename to android/source/res/drawable-xhdpi/handle_start.png diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png b/android/source/res/drawable-xxxhdpi/action_bold.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png rename to android/source/res/drawable-xxxhdpi/action_bold.png diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png b/android/source/res/drawable-xxxhdpi/action_italic.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png rename to android/source/res/drawable-xxxhdpi/action_italic.png diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png b/android/source/res/drawable-xxxhdpi/action_strikeout.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png rename to android/source/res/drawable-xxxhdpi/action_strikeout.png diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png b/android/source/res/drawable-xxxhdpi/action_underline.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png rename to android/source/res/drawable-xxxhdpi/action_underline.png diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_check_grey600_24dp.png b/android/source/res/drawable-xxxhdpi/ic_check_grey600_24dp.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_check_grey600_24dp.png rename to android/source/res/drawable-xxxhdpi/ic_check_grey600_24dp.png diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png rename to android/source/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png diff --git a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png b/android/source/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png rename to android/source/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png diff --git a/android/experimental/LOAndroid3/res/drawable/bg_striped.xml b/android/source/res/drawable/bg_striped.xml similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/bg_striped.xml rename to android/source/res/drawable/bg_striped.xml diff --git a/android/experimental/LOAndroid3/res/drawable/bg_striped_split.xml b/android/source/res/drawable/bg_striped_split.xml similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/bg_striped_split.xml rename to android/source/res/drawable/bg_striped_split.xml diff --git a/android/experimental/LOAndroid3/res/drawable/black_white_gradient.xml b/android/source/res/drawable/black_white_gradient.xml similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/black_white_gradient.xml rename to android/source/res/drawable/black_white_gradient.xml diff --git a/android/experimental/LOAndroid3/res/drawable/calc.png b/android/source/res/drawable/calc.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/calc.png rename to android/source/res/drawable/calc.png diff --git a/android/experimental/LOAndroid3/res/drawable/draw.png b/android/source/res/drawable/draw.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/draw.png rename to android/source/res/drawable/draw.png diff --git a/android/experimental/LOAndroid3/res/drawable/dummy_page.png b/android/source/res/drawable/dummy_page.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/dummy_page.png rename to android/source/res/drawable/dummy_page.png diff --git a/android/experimental/LOAndroid3/res/drawable/folder.png b/android/source/res/drawable/folder.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/folder.png rename to android/source/res/drawable/folder.png diff --git a/android/experimental/LOAndroid3/res/drawable/handle_end.png b/android/source/res/drawable/handle_end.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/handle_end.png rename to android/source/res/drawable/handle_end.png diff --git a/android/experimental/LOAndroid3/res/drawable/handle_end_level.xml b/android/source/res/drawable/handle_end_level.xml similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/handle_end_level.xml rename to android/source/res/drawable/handle_end_level.xml diff --git a/android/experimental/LOAndroid3/res/drawable/handle_graphic.png b/android/source/res/drawable/handle_graphic.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/handle_graphic.png rename to android/source/res/drawable/handle_graphic.png diff --git a/android/experimental/LOAndroid3/res/drawable/handle_middle.png b/android/source/res/drawable/handle_middle.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/handle_middle.png rename to android/source/res/drawable/handle_middle.png diff --git a/android/experimental/LOAndroid3/res/drawable/handle_start.png b/android/source/res/drawable/handle_start.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/handle_start.png rename to android/source/res/drawable/handle_start.png diff --git a/android/experimental/LOAndroid3/res/drawable/handle_start_level.xml b/android/source/res/drawable/handle_start_level.xml similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/handle_start_level.xml rename to android/source/res/drawable/handle_start_level.xml diff --git a/android/experimental/LOAndroid3/res/drawable/impress.png b/android/source/res/drawable/impress.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/impress.png rename to android/source/res/drawable/impress.png diff --git a/android/experimental/LOAndroid3/res/drawable/writer.png b/android/source/res/drawable/writer.png similarity index 100% rename from android/experimental/LOAndroid3/res/drawable/writer.png rename to android/source/res/drawable/writer.png diff --git a/android/experimental/LOAndroid3/res/layout/about.xml b/android/source/res/layout/about.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/about.xml rename to android/source/res/layout/about.xml diff --git a/android/experimental/LOAndroid3/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/activity_document_browser.xml rename to android/source/res/layout/activity_document_browser.xml diff --git a/android/experimental/LOAndroid3/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/activity_main.xml rename to android/source/res/layout/activity_main.xml diff --git a/android/experimental/LOAndroid3/res/layout/document_part_list_layout.xml b/android/source/res/layout/document_part_list_layout.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/document_part_list_layout.xml rename to android/source/res/layout/document_part_list_layout.xml diff --git a/android/experimental/LOAndroid3/res/layout/document_viewer.xml b/android/source/res/layout/document_viewer.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/document_viewer.xml rename to android/source/res/layout/document_viewer.xml diff --git a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml b/android/source/res/layout/file_explorer_grid_item.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml rename to android/source/res/layout/file_explorer_grid_item.xml diff --git a/android/experimental/LOAndroid3/res/layout/file_grid.xml b/android/source/res/layout/file_grid.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/file_grid.xml rename to android/source/res/layout/file_grid.xml diff --git a/android/experimental/LOAndroid3/res/layout/file_list.xml b/android/source/res/layout/file_list.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/file_list.xml rename to android/source/res/layout/file_list.xml diff --git a/android/experimental/LOAndroid3/res/layout/file_list_item.xml b/android/source/res/layout/file_list_item.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/file_list_item.xml rename to android/source/res/layout/file_list_item.xml diff --git a/android/experimental/LOAndroid3/res/layout/item_in_drawer.xml b/android/source/res/layout/item_in_drawer.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/item_in_drawer.xml rename to android/source/res/layout/item_in_drawer.xml diff --git a/android/experimental/LOAndroid3/res/layout/main.xml b/android/source/res/layout/main.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/main.xml rename to android/source/res/layout/main.xml diff --git a/android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml b/android/source/res/layout/navigation_grid_item.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml rename to android/source/res/layout/navigation_grid_item.xml diff --git a/android/experimental/LOAndroid3/res/layout/text_selection_handles.xml b/android/source/res/layout/text_selection_handles.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/text_selection_handles.xml rename to android/source/res/layout/text_selection_handles.xml diff --git a/android/experimental/LOAndroid3/res/layout/toolbar.xml b/android/source/res/layout/toolbar.xml similarity index 100% rename from android/experimental/LOAndroid3/res/layout/toolbar.xml rename to android/source/res/layout/toolbar.xml diff --git a/android/experimental/LOAndroid3/res/menu/context_menu.xml b/android/source/res/menu/context_menu.xml similarity index 100% rename from android/experimental/LOAndroid3/res/menu/context_menu.xml rename to android/source/res/menu/context_menu.xml diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/source/res/menu/main.xml similarity index 100% rename from android/experimental/LOAndroid3/res/menu/main.xml rename to android/source/res/menu/main.xml diff --git a/android/experimental/LOAndroid3/res/menu/view_menu.xml b/android/source/res/menu/view_menu.xml similarity index 100% rename from android/experimental/LOAndroid3/res/menu/view_menu.xml rename to android/source/res/menu/view_menu.xml diff --git a/android/experimental/LOAndroid3/res/values-v21/themes.xml b/android/source/res/values-v21/themes.xml similarity index 100% rename from android/experimental/LOAndroid3/res/values-v21/themes.xml rename to android/source/res/values-v21/themes.xml diff --git a/android/experimental/LOAndroid3/res/values/arrays.xml b/android/source/res/values/arrays.xml similarity index 100% rename from android/experimental/LOAndroid3/res/values/arrays.xml rename to android/source/res/values/arrays.xml diff --git a/android/experimental/LOAndroid3/res/values/attrs.xml b/android/source/res/values/attrs.xml similarity index 100% rename from android/experimental/LOAndroid3/res/values/attrs.xml rename to android/source/res/values/attrs.xml diff --git a/android/experimental/LOAndroid3/res/values/colors.xml b/android/source/res/values/colors.xml similarity index 100% rename from android/experimental/LOAndroid3/res/values/colors.xml rename to android/source/res/values/colors.xml diff --git a/android/experimental/LOAndroid3/res/values/dimens.xml b/android/source/res/values/dimens.xml similarity index 100% rename from android/experimental/LOAndroid3/res/values/dimens.xml rename to android/source/res/values/dimens.xml diff --git a/android/experimental/LOAndroid3/res/values/ids.xml b/android/source/res/values/ids.xml similarity index 100% rename from android/experimental/LOAndroid3/res/values/ids.xml rename to android/source/res/values/ids.xml diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/source/res/values/strings.xml similarity index 100% rename from android/experimental/LOAndroid3/res/values/strings.xml rename to android/source/res/values/strings.xml diff --git a/android/experimental/LOAndroid3/res/values/themes.xml b/android/source/res/values/themes.xml similarity index 100% rename from android/experimental/LOAndroid3/res/values/themes.xml rename to android/source/res/values/themes.xml diff --git a/android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml b/android/source/res/xml/libreoffice_preferences.xml similarity index 100% rename from android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml rename to android/source/res/xml/libreoffice_preferences.xml diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java b/android/source/src/java/org/libreoffice/DocumentPartView.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java rename to android/source/src/java/org/libreoffice/DocumentPartView.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java b/android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java rename to android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java b/android/source/src/java/org/libreoffice/InvalidationHandler.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java rename to android/source/src/java/org/libreoffice/InvalidationHandler.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java b/android/source/src/java/org/libreoffice/LOAbout.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java rename to android/source/src/java/org/libreoffice/LOAbout.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java b/android/source/src/java/org/libreoffice/LOEvent.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java rename to android/source/src/java/org/libreoffice/LOEvent.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitInputConnectionHandler.java b/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitInputConnectionHandler.java rename to android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java b/android/source/src/java/org/libreoffice/LOKitShell.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java rename to android/source/src/java/org/libreoffice/LOKitShell.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/source/src/java/org/libreoffice/LOKitThread.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java rename to android/source/src/java/org/libreoffice/LOKitThread.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/source/src/java/org/libreoffice/LOKitTileProvider.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java rename to android/source/src/java/org/libreoffice/LOKitTileProvider.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java rename to android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java b/android/source/src/java/org/libreoffice/MockTileProvider.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java rename to android/source/src/java/org/libreoffice/MockTileProvider.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/SettingsActivity.java b/android/source/src/java/org/libreoffice/SettingsActivity.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/SettingsActivity.java rename to android/source/src/java/org/libreoffice/SettingsActivity.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java b/android/source/src/java/org/libreoffice/ThumbnailCreator.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java rename to android/source/src/java/org/libreoffice/ThumbnailCreator.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java b/android/source/src/java/org/libreoffice/TileIdentifier.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java rename to android/source/src/java/org/libreoffice/TileIdentifier.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java b/android/source/src/java/org/libreoffice/TileProvider.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java rename to android/source/src/java/org/libreoffice/TileProvider.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProviderFactory.java b/android/source/src/java/org/libreoffice/TileProviderFactory.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/TileProviderFactory.java rename to android/source/src/java/org/libreoffice/TileProviderFactory.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java b/android/source/src/java/org/libreoffice/ToolbarController.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java rename to android/source/src/java/org/libreoffice/ToolbarController.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/BitmapHandle.java b/android/source/src/java/org/libreoffice/canvas/BitmapHandle.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/BitmapHandle.java rename to android/source/src/java/org/libreoffice/canvas/BitmapHandle.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java b/android/source/src/java/org/libreoffice/canvas/CanvasElement.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java rename to android/source/src/java/org/libreoffice/canvas/CanvasElement.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java b/android/source/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java rename to android/source/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java b/android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java rename to android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/Cursor.java b/android/source/src/java/org/libreoffice/canvas/Cursor.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/Cursor.java rename to android/source/src/java/org/libreoffice/canvas/Cursor.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java b/android/source/src/java/org/libreoffice/canvas/GraphicSelection.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java rename to android/source/src/java/org/libreoffice/canvas/GraphicSelection.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java b/android/source/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java rename to android/source/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/ImageUtils.java b/android/source/src/java/org/libreoffice/canvas/ImageUtils.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/ImageUtils.java rename to android/source/src/java/org/libreoffice/canvas/ImageUtils.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java b/android/source/src/java/org/libreoffice/canvas/SelectionHandle.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java rename to android/source/src/java/org/libreoffice/canvas/SelectionHandle.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleEnd.java b/android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleEnd.java rename to android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java b/android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java rename to android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleStart.java b/android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleStart.java rename to android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlay.java b/android/source/src/java/org/libreoffice/overlay/DocumentOverlay.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlay.java rename to android/source/src/java/org/libreoffice/overlay/DocumentOverlay.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlayView.java b/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlayView.java rename to android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/DocumentProviderFactory.java b/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/storage/DocumentProviderFactory.java rename to android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/IDocumentProvider.java b/android/source/src/java/org/libreoffice/storage/IDocumentProvider.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/storage/IDocumentProvider.java rename to android/source/src/java/org/libreoffice/storage/IDocumentProvider.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/IFile.java b/android/source/src/java/org/libreoffice/storage/IFile.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/storage/IFile.java rename to android/source/src/java/org/libreoffice/storage/IFile.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java b/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java rename to android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsProvider.java b/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsProvider.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsProvider.java rename to android/source/src/java/org/libreoffice/storage/local/LocalDocumentsProvider.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalFile.java b/android/source/src/java/org/libreoffice/storage/local/LocalFile.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalFile.java rename to android/source/src/java/org/libreoffice/storage/local/LocalFile.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java rename to android/source/src/java/org/libreoffice/ui/FileUtilities.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java b/android/source/src/java/org/libreoffice/ui/FolderIconView.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java rename to android/source/src/java/org/libreoffice/ui/FolderIconView.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java b/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java rename to android/source/src/java/org/libreoffice/ui/GridItemAdapter.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java rename to android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java b/android/source/src/java/org/libreoffice/ui/PageView.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java rename to android/source/src/java/org/libreoffice/ui/PageView.java diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java b/android/source/src/java/org/libreoffice/ui/WriterViewerActivity.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java rename to android/source/src/java/org/libreoffice/ui/WriterViewerActivity.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnInterceptTouchListener.java b/android/source/src/java/org/mozilla/gecko/OnInterceptTouchListener.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnInterceptTouchListener.java rename to android/source/src/java/org/mozilla/gecko/OnInterceptTouchListener.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java b/android/source/src/java/org/mozilla/gecko/OnSlideSwipeListener.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java rename to android/source/src/java/org/mozilla/gecko/OnSlideSwipeListener.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java b/android/source/src/java/org/mozilla/gecko/ZoomConstraints.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java rename to android/source/src/java/org/mozilla/gecko/ZoomConstraints.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Axis.java b/android/source/src/java/org/mozilla/gecko/gfx/Axis.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Axis.java rename to android/source/src/java/org/mozilla/gecko/gfx/Axis.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java b/android/source/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java rename to android/source/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java b/android/source/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java rename to android/source/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoImage.java b/android/source/src/java/org/mozilla/gecko/gfx/CairoImage.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoImage.java rename to android/source/src/java/org/mozilla/gecko/gfx/CairoImage.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoUtils.java b/android/source/src/java/org/mozilla/gecko/gfx/CairoUtils.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoUtils.java rename to android/source/src/java/org/mozilla/gecko/gfx/CairoUtils.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java rename to android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java b/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java rename to android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java b/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java rename to android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java rename to android/source/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java rename to android/source/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java b/android/source/src/java/org/mozilla/gecko/gfx/FloatSize.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java rename to android/source/src/java/org/mozilla/gecko/gfx/FloatSize.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLController.java b/android/source/src/java/org/mozilla/gecko/gfx/GLController.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLController.java rename to android/source/src/java/org/mozilla/gecko/gfx/GLController.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java rename to android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java b/android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java rename to android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java b/android/source/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java rename to android/source/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/IntSize.java b/android/source/src/java/org/mozilla/gecko/gfx/IntSize.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/IntSize.java rename to android/source/src/java/org/mozilla/gecko/gfx/IntSize.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java rename to android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java b/android/source/src/java/org/mozilla/gecko/gfx/Layer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java rename to android/source/src/java/org/mozilla/gecko/gfx/Layer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java rename to android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java rename to android/source/src/java/org/mozilla/gecko/gfx/LayerView.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java rename to android/source/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomController.java rename to android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java b/android/source/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java rename to android/source/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java b/android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java rename to android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RectUtils.java b/android/source/src/java/org/mozilla/gecko/gfx/RectUtils.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RectUtils.java rename to android/source/src/java/org/mozilla/gecko/gfx/RectUtils.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java b/android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java rename to android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java rename to android/source/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java b/android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java rename to android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java rename to android/source/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java b/android/source/src/java/org/mozilla/gecko/gfx/SubTile.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java rename to android/source/src/java/org/mozilla/gecko/gfx/SubTile.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java b/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java rename to android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/TextLayer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextLayer.java rename to android/source/src/java/org/mozilla/gecko/gfx/TextLayer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java b/android/source/src/java/org/mozilla/gecko/gfx/TextureGenerator.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java rename to android/source/src/java/org/mozilla/gecko/gfx/TextureGenerator.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java b/android/source/src/java/org/mozilla/gecko/gfx/TextureReaper.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java rename to android/source/src/java/org/mozilla/gecko/gfx/TextureReaper.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/TileLayer.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java rename to android/source/src/java/org/mozilla/gecko/gfx/TileLayer.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java b/android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java rename to android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java b/android/source/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java rename to android/source/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java b/android/source/src/java/org/mozilla/gecko/util/FloatUtils.java similarity index 100% rename from android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java rename to android/source/src/java/org/mozilla/gecko/util/FloatUtils.java _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits