diff --git a/Makefile.in b/Makefile.in index 17671ce8f820..39b00f69a15d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -207,10 +207,10 @@ ifneq ($(CROSS_COMPILING),) ifeq ($(OS),ANDROID) rm -fr $(BUILDDIR)/android/obj rm -fr $(BUILDDIR)/android/jniLibs - rm -fr $(SRCDIR)/android/source/build - rm -fr $(SRCDIR)/android/source/assets - rm -fr $(SRCDIR)/android/source/assets_strippedUI - rm -fr $(SRCDIR)/android/source/res_generated + rm -fr $(SRCDIR)/android/app/build + rm -fr $(SRCDIR)/android/app/assets + rm -fr $(SRCDIR)/android/app/assets_strippedUI + rm -fr $(SRCDIR)/android/app/res_generated endif endif diff --git a/README.cross b/README.cross index e416469fce1b..b5b53fc226cc 100644 --- a/README.cross +++ b/README.cross @@ -165,7 +165,7 @@ And here is an (quite old) autogen.input for Android on X86: --with-distro=LibreOfficeAndroidX86 A LibreOffice app for Android is being developed progress in the -android/source directory. +android/app directory. To run the app, do "make install" followed by either "make run" or starting it from Android itself. You most likely want to have an "adb logcat" diff --git a/android/.gitignore b/android/.gitignore index a06252d55ab3..6705814bddc7 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -2,14 +2,14 @@ /.gradle /.idea /local.properties -/source/assets/ -/source/assets_strippedUI/ -/source/build/ -/source/captures/ -/source/jni/Application.mk -/source/res_generated +/app/assets/ +/app/assets_strippedUI/ +/app/build/ +/app/captures/ +/app/jni/Application.mk +/app/res_generated /jniLibs/ -/source/liboSettings.gradle.kts -/source/native-code.cxx +/app/liboSettings.gradle.kts +/app/native-code.cxx /obj/ -/source/source.iml +/app/source.iml diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 920945b0df7e..89b2d00b0426 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -8,7 +8,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,android/loandroid3)) -loandroid3_DIR := $(gb_CustomTarget_workdir)/android/source +loandroid3_DIR := $(gb_CustomTarget_workdir)/android/app $(call gb_CustomTarget_get_target,android/loandroid3) : \ $(loandroid3_DIR)/done @@ -17,18 +17,18 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MAK) cd $(SRCDIR)/android && $(MAKE) local.properties - cd $(SRCDIR)/android/source && $(MAKE) all + cd $(SRCDIR)/android/app && $(MAKE) all ifeq ($(ENABLE_JAVA),TRUE) # 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; \ - if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi + if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/app/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MAK) endif $(call gb_CustomTarget_get_clean_target,android/loandroid3) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) - cd $(SRCDIR)/android/source && $(MAKE) clean + cd $(SRCDIR)/android/app && $(MAKE) clean # vim: set noet sw=4 ts=4: diff --git a/android/Makefile b/android/Makefile index fb64e5bfac3b..cb5c3fc30292 100644 --- a/android/Makefile +++ b/android/Makefile @@ -12,7 +12,7 @@ include $(module_directory)/../solenv/gbuild/partial_build.mk .PHONY: sign -SIGNED_APK := $(BUILDDIR)/android/source/bin/LibreOfficeViewer.apk +SIGNED_APK := $(BUILDDIR)/android/app/bin/LibreOfficeViewer.apk RELEASE_APK_USAGE := echo; echo "Usage: make versionCode= key= release-apk" local.properties: $(BUILDDIR)/config_host.mk @@ -26,8 +26,8 @@ release-apk: build rm -f $(SIGNED_APK) # the actual signing - jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/source/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(key) - $(ANDROID_SDK_DIR)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/source/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(SIGNED_APK) + jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/app/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(key) + $(ANDROID_SDK_DIR)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/app/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(SIGNED_APK) @echo @echo "Resulting signed apk: $(SIGNED_APK)" diff --git a/android/README.md b/android/README.md index 12039a89c16e..17331b5ef7a3 100644 --- a/android/README.md +++ b/android/README.md @@ -6,7 +6,7 @@ Contains common code for all projects on Android to bootstrap LibreOffice. In addition it is a home to `LibreOfficeKit` (LOK - see `libreofficekit/README.md`) JNI classes. -## Stuff in Source Directory +## Stuff in App Directory LibreOffice Android application - the code is based on Fennec (Firefox for Android). It uses OpenGL ES 2 for rendering of the document tiles which are gathered from @@ -163,7 +163,7 @@ For instructions on how to build for Android, see `README.cross`. Attach your device, so 'adb devices' shows it. Then run: - cd android/source + cd android/app make install adb logcat @@ -236,7 +236,7 @@ Using `lldb` from within Android Studio is more comfortable though and works lik - open `android` directory in Android Studio via File|Open... - make sure you select the right build variant (`strippedUIDebug` is what you want) - use Run|Edit Configurations to create a new configuration of type "Android Native" - - on tab "General" pick module "source" + - on tab "General" pick module "app" - on tab "Native Debugger" add `android/obj/local/` to the Symbol directories - on the LLDB startup commands tab add @@ -323,7 +323,7 @@ heavy lifting. ## Triple-T metadata for F-Droid -The subdirectory `source/src/main/play` contains data in the Triple-T +The subdirectory `app/src/main/play` contains data in the Triple-T structure that F-Droid evaluates to extract metadata. More information: diff --git a/android/source/AndroidManifest.xml b/android/app/AndroidManifest.xml similarity index 100% rename from android/source/AndroidManifest.xml rename to android/app/AndroidManifest.xml diff --git a/android/source/AndroidManifest_quest.xml b/android/app/AndroidManifest_quest.xml similarity index 100% rename from android/source/AndroidManifest_quest.xml rename to android/app/AndroidManifest_quest.xml diff --git a/android/source/Makefile b/android/app/Makefile similarity index 100% rename from android/source/Makefile rename to android/app/Makefile diff --git a/android/source/ReleaseManifest.xml b/android/app/ReleaseManifest.xml similarity index 100% rename from android/source/ReleaseManifest.xml rename to android/app/ReleaseManifest.xml diff --git a/android/source/build.gradle.kts b/android/app/build.gradle.kts similarity index 100% rename from android/source/build.gradle.kts rename to android/app/build.gradle.kts diff --git a/android/source/fonts.conf b/android/app/fonts.conf similarity index 100% rename from android/source/fonts.conf rename to android/app/fonts.conf diff --git a/android/source/ic_launcher-web.png b/android/app/ic_launcher-web.png similarity index 100% rename from android/source/ic_launcher-web.png rename to android/app/ic_launcher-web.png diff --git a/android/source/lint-baseline.xml b/android/app/lint-baseline.xml similarity index 100% rename from android/source/lint-baseline.xml rename to android/app/lint-baseline.xml diff --git a/android/source/lint.xml b/android/app/lint.xml similarity index 100% rename from android/source/lint.xml rename to android/app/lint.xml diff --git a/android/source/proguard-project.txt b/android/app/proguard-project.txt similarity index 100% rename from android/source/proguard-project.txt rename to android/app/proguard-project.txt diff --git a/android/source/res/anim/fab_close.xml b/android/app/res/anim/fab_close.xml similarity index 100% rename from android/source/res/anim/fab_close.xml rename to android/app/res/anim/fab_close.xml diff --git a/android/source/res/anim/fab_open.xml b/android/app/res/anim/fab_open.xml similarity index 100% rename from android/source/res/anim/fab_open.xml rename to android/app/res/anim/fab_open.xml diff --git a/android/source/res/drawable-hdpi/handle_alias_end.xml b/android/app/res/drawable-hdpi/handle_alias_end.xml similarity index 100% rename from android/source/res/drawable-hdpi/handle_alias_end.xml rename to android/app/res/drawable-hdpi/handle_alias_end.xml diff --git a/android/source/res/drawable-hdpi/handle_alias_middle.xml b/android/app/res/drawable-hdpi/handle_alias_middle.xml similarity index 100% rename from android/source/res/drawable-hdpi/handle_alias_middle.xml rename to android/app/res/drawable-hdpi/handle_alias_middle.xml diff --git a/android/source/res/drawable-hdpi/handle_alias_start.xml b/android/app/res/drawable-hdpi/handle_alias_start.xml similarity index 100% rename from android/source/res/drawable-hdpi/handle_alias_start.xml rename to android/app/res/drawable-hdpi/handle_alias_start.xml diff --git a/android/source/res/drawable-hdpi/ic_folder_48dp.xml b/android/app/res/drawable-hdpi/ic_folder_48dp.xml similarity index 100% rename from android/source/res/drawable-hdpi/ic_folder_48dp.xml rename to android/app/res/drawable-hdpi/ic_folder_48dp.xml diff --git a/android/source/res/drawable-hdpi/ic_format_bold.xml b/android/app/res/drawable-hdpi/ic_format_bold.xml similarity index 100% rename from android/source/res/drawable-hdpi/ic_format_bold.xml rename to android/app/res/drawable-hdpi/ic_format_bold.xml diff --git a/android/source/res/drawable-hdpi/ic_format_italic.xml b/android/app/res/drawable-hdpi/ic_format_italic.xml similarity index 100% rename from android/source/res/drawable-hdpi/ic_format_italic.xml rename to android/app/res/drawable-hdpi/ic_format_italic.xml diff --git a/android/source/res/drawable-hdpi/ic_format_strikethrough.xml b/android/app/res/drawable-hdpi/ic_format_strikethrough.xml similarity index 100% rename from android/source/res/drawable-hdpi/ic_format_strikethrough.xml rename to android/app/res/drawable-hdpi/ic_format_strikethrough.xml diff --git a/android/source/res/drawable-hdpi/ic_format_underlined.xml b/android/app/res/drawable-hdpi/ic_format_underlined.xml similarity index 100% rename from android/source/res/drawable-hdpi/ic_format_underlined.xml rename to android/app/res/drawable-hdpi/ic_format_underlined.xml diff --git a/android/source/res/drawable-hdpi/ic_keyboard.xml b/android/app/res/drawable-hdpi/ic_keyboard.xml similarity index 100% rename from android/source/res/drawable-hdpi/ic_keyboard.xml rename to android/app/res/drawable-hdpi/ic_keyboard.xml diff --git a/android/source/res/drawable-hdpi/ic_menu.xml b/android/app/res/drawable-hdpi/ic_menu.xml similarity index 100% rename from android/source/res/drawable-hdpi/ic_menu.xml rename to android/app/res/drawable-hdpi/ic_menu.xml diff --git a/android/source/res/drawable-hdpi/ic_text_format.xml b/android/app/res/drawable-hdpi/ic_text_format.xml similarity index 100% rename from android/source/res/drawable-hdpi/ic_text_format.xml rename to android/app/res/drawable-hdpi/ic_text_format.xml diff --git a/android/source/res/drawable-hdpi/light_view_as_grid.png b/android/app/res/drawable-hdpi/light_view_as_grid.png similarity index 100% rename from android/source/res/drawable-hdpi/light_view_as_grid.png rename to android/app/res/drawable-hdpi/light_view_as_grid.png diff --git a/android/source/res/drawable-hdpi/light_view_as_list.png b/android/app/res/drawable-hdpi/light_view_as_list.png similarity index 100% rename from android/source/res/drawable-hdpi/light_view_as_list.png rename to android/app/res/drawable-hdpi/light_view_as_list.png diff --git a/android/source/res/drawable-mdpi/background.png b/android/app/res/drawable-mdpi/background.png similarity index 100% rename from android/source/res/drawable-mdpi/background.png rename to android/app/res/drawable-mdpi/background.png diff --git a/android/source/res/drawable-mdpi/shadow.png b/android/app/res/drawable-mdpi/shadow.png similarity index 100% rename from android/source/res/drawable-mdpi/shadow.png rename to android/app/res/drawable-mdpi/shadow.png diff --git a/android/source/res/drawable-xhdpi/handle_image_end.png b/android/app/res/drawable-xhdpi/handle_image_end.png similarity index 100% rename from android/source/res/drawable-xhdpi/handle_image_end.png rename to android/app/res/drawable-xhdpi/handle_image_end.png diff --git a/android/source/res/drawable-xhdpi/handle_image_middle.png b/android/app/res/drawable-xhdpi/handle_image_middle.png similarity index 100% rename from android/source/res/drawable-xhdpi/handle_image_middle.png rename to android/app/res/drawable-xhdpi/handle_image_middle.png diff --git a/android/source/res/drawable-xhdpi/handle_image_start.png b/android/app/res/drawable-xhdpi/handle_image_start.png similarity index 100% rename from android/source/res/drawable-xhdpi/handle_image_start.png rename to android/app/res/drawable-xhdpi/handle_image_start.png diff --git a/android/source/res/drawable-xxxhdpi/decrementindent.png b/android/app/res/drawable-xxxhdpi/decrementindent.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/decrementindent.png rename to android/app/res/drawable-xxxhdpi/decrementindent.png diff --git a/android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_check_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_check_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_keyboard_black__24dp.png b/android/app/res/drawable-xxxhdpi/ic_keyboard_black__24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_keyboard_black__24dp.png rename to android/app/res/drawable-xxxhdpi/ic_keyboard_black__24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_menu_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_menu_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_redo_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_redo_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_redo_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_redo_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_search_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_search_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_search_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_search_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_search_direction_down_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_search_direction_down_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_search_direction_down_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_search_direction_down_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_search_direction_up_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_search_direction_up_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_search_direction_up_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_search_direction_up_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_text_format_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_text_format_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_undo_black_24dp.png b/android/app/res/drawable-xxxhdpi/ic_undo_black_24dp.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/ic_undo_black_24dp.png rename to android/app/res/drawable-xxxhdpi/ic_undo_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/image_button_background.xml b/android/app/res/drawable-xxxhdpi/image_button_background.xml similarity index 100% rename from android/source/res/drawable-xxxhdpi/image_button_background.xml rename to android/app/res/drawable-xxxhdpi/image_button_background.xml diff --git a/android/source/res/drawable-xxxhdpi/incrementindent.png b/android/app/res/drawable-xxxhdpi/incrementindent.png similarity index 100% rename from android/source/res/drawable-xxxhdpi/incrementindent.png rename to android/app/res/drawable-xxxhdpi/incrementindent.png diff --git a/android/source/res/drawable/calc.png b/android/app/res/drawable/calc.png similarity index 100% rename from android/source/res/drawable/calc.png rename to android/app/res/drawable/calc.png diff --git a/android/source/res/drawable/draw.png b/android/app/res/drawable/draw.png similarity index 100% rename from android/source/res/drawable/draw.png rename to android/app/res/drawable/draw.png diff --git a/android/source/res/drawable/dummy_page.png b/android/app/res/drawable/dummy_page.png similarity index 100% rename from android/source/res/drawable/dummy_page.png rename to android/app/res/drawable/dummy_page.png diff --git a/android/source/res/drawable/ic_add_24dp.xml b/android/app/res/drawable/ic_add_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_add_24dp.xml rename to android/app/res/drawable/ic_add_24dp.xml diff --git a/android/source/res/drawable/ic_arrow_back_24dp.xml b/android/app/res/drawable/ic_arrow_back_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_arrow_back_24dp.xml rename to android/app/res/drawable/ic_arrow_back_24dp.xml diff --git a/android/source/res/drawable/ic_auto_color.xml b/android/app/res/drawable/ic_auto_color.xml similarity index 100% rename from android/source/res/drawable/ic_auto_color.xml rename to android/app/res/drawable/ic_auto_color.xml diff --git a/android/source/res/drawable/ic_check.xml b/android/app/res/drawable/ic_check.xml similarity index 100% rename from android/source/res/drawable/ic_check.xml rename to android/app/res/drawable/ic_check.xml diff --git a/android/source/res/drawable/ic_content_copy_24dp.xml b/android/app/res/drawable/ic_content_copy_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_content_copy_24dp.xml rename to android/app/res/drawable/ic_content_copy_24dp.xml diff --git a/android/source/res/drawable/ic_content_cut_24dp.xml b/android/app/res/drawable/ic_content_cut_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_content_cut_24dp.xml rename to android/app/res/drawable/ic_content_cut_24dp.xml diff --git a/android/source/res/drawable/ic_content_paste_24dp.xml b/android/app/res/drawable/ic_content_paste_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_content_paste_24dp.xml rename to android/app/res/drawable/ic_content_paste_24dp.xml diff --git a/android/source/res/drawable/ic_decrementindent.xml b/android/app/res/drawable/ic_decrementindent.xml similarity index 100% rename from android/source/res/drawable/ic_decrementindent.xml rename to android/app/res/drawable/ic_decrementindent.xml diff --git a/android/source/res/drawable/ic_done_all_white_12dp.xml b/android/app/res/drawable/ic_done_all_white_12dp.xml similarity index 100% rename from android/source/res/drawable/ic_done_all_white_12dp.xml rename to android/app/res/drawable/ic_done_all_white_12dp.xml diff --git a/android/source/res/drawable/ic_done_white_12dp.xml b/android/app/res/drawable/ic_done_white_12dp.xml similarity index 100% rename from android/source/res/drawable/ic_done_white_12dp.xml rename to android/app/res/drawable/ic_done_white_12dp.xml diff --git a/android/source/res/drawable/ic_filter_list_24dp.xml b/android/app/res/drawable/ic_filter_list_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_filter_list_24dp.xml rename to android/app/res/drawable/ic_filter_list_24dp.xml diff --git a/android/source/res/drawable/ic_folder_24dp.xml b/android/app/res/drawable/ic_folder_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_folder_24dp.xml rename to android/app/res/drawable/ic_folder_24dp.xml diff --git a/android/source/res/drawable/ic_format_align_center.xml b/android/app/res/drawable/ic_format_align_center.xml similarity index 100% rename from android/source/res/drawable/ic_format_align_center.xml rename to android/app/res/drawable/ic_format_align_center.xml diff --git a/android/source/res/drawable/ic_format_align_justify.xml b/android/app/res/drawable/ic_format_align_justify.xml similarity index 100% rename from android/source/res/drawable/ic_format_align_justify.xml rename to android/app/res/drawable/ic_format_align_justify.xml diff --git a/android/source/res/drawable/ic_format_align_left.xml b/android/app/res/drawable/ic_format_align_left.xml similarity index 100% rename from android/source/res/drawable/ic_format_align_left.xml rename to android/app/res/drawable/ic_format_align_left.xml diff --git a/android/source/res/drawable/ic_format_align_right.xml b/android/app/res/drawable/ic_format_align_right.xml similarity index 100% rename from android/source/res/drawable/ic_format_align_right.xml rename to android/app/res/drawable/ic_format_align_right.xml diff --git a/android/source/res/drawable/ic_format_bullets.xml b/android/app/res/drawable/ic_format_bullets.xml similarity index 100% rename from android/source/res/drawable/ic_format_bullets.xml rename to android/app/res/drawable/ic_format_bullets.xml diff --git a/android/source/res/drawable/ic_format_clear_24dp.xml b/android/app/res/drawable/ic_format_clear_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_format_clear_24dp.xml rename to android/app/res/drawable/ic_format_clear_24dp.xml diff --git a/android/source/res/drawable/ic_format_numbering.xml b/android/app/res/drawable/ic_format_numbering.xml similarity index 100% rename from android/source/res/drawable/ic_format_numbering.xml rename to android/app/res/drawable/ic_format_numbering.xml diff --git a/android/source/res/drawable/ic_grid_off_24dp.xml b/android/app/res/drawable/ic_grid_off_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_grid_off_24dp.xml rename to android/app/res/drawable/ic_grid_off_24dp.xml diff --git a/android/source/res/drawable/ic_grid_on_24dp.xml b/android/app/res/drawable/ic_grid_on_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_grid_on_24dp.xml rename to android/app/res/drawable/ic_grid_on_24dp.xml diff --git a/android/source/res/drawable/ic_grow.xml b/android/app/res/drawable/ic_grow.xml similarity index 100% rename from android/source/res/drawable/ic_grow.xml rename to android/app/res/drawable/ic_grow.xml diff --git a/android/source/res/drawable/ic_incrementindent.xml b/android/app/res/drawable/ic_incrementindent.xml similarity index 100% rename from android/source/res/drawable/ic_incrementindent.xml rename to android/app/res/drawable/ic_incrementindent.xml diff --git a/android/source/res/drawable/ic_line.xml b/android/app/res/drawable/ic_line.xml similarity index 100% rename from android/source/res/drawable/ic_line.xml rename to android/app/res/drawable/ic_line.xml diff --git a/android/source/res/drawable/ic_rect.xml b/android/app/res/drawable/ic_rect.xml similarity index 100% rename from android/source/res/drawable/ic_rect.xml rename to android/app/res/drawable/ic_rect.xml diff --git a/android/source/res/drawable/ic_redo.xml b/android/app/res/drawable/ic_redo.xml similarity index 100% rename from android/source/res/drawable/ic_redo.xml rename to android/app/res/drawable/ic_redo.xml diff --git a/android/source/res/drawable/ic_search.xml b/android/app/res/drawable/ic_search.xml similarity index 100% rename from android/source/res/drawable/ic_search.xml rename to android/app/res/drawable/ic_search.xml diff --git a/android/source/res/drawable/ic_search_direction_down.xml b/android/app/res/drawable/ic_search_direction_down.xml similarity index 100% rename from android/source/res/drawable/ic_search_direction_down.xml rename to android/app/res/drawable/ic_search_direction_down.xml diff --git a/android/source/res/drawable/ic_search_direction_up.xml b/android/app/res/drawable/ic_search_direction_up.xml similarity index 100% rename from android/source/res/drawable/ic_search_direction_up.xml rename to android/app/res/drawable/ic_search_direction_up.xml diff --git a/android/source/res/drawable/ic_settings_24dp.xml b/android/app/res/drawable/ic_settings_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_settings_24dp.xml rename to android/app/res/drawable/ic_settings_24dp.xml diff --git a/android/source/res/drawable/ic_shrink.xml b/android/app/res/drawable/ic_shrink.xml similarity index 100% rename from android/source/res/drawable/ic_shrink.xml rename to android/app/res/drawable/ic_shrink.xml diff --git a/android/source/res/drawable/ic_sort_24dp.xml b/android/app/res/drawable/ic_sort_24dp.xml similarity index 100% rename from android/source/res/drawable/ic_sort_24dp.xml rename to android/app/res/drawable/ic_sort_24dp.xml diff --git a/android/source/res/drawable/ic_subscript.xml b/android/app/res/drawable/ic_subscript.xml similarity index 100% rename from android/source/res/drawable/ic_subscript.xml rename to android/app/res/drawable/ic_subscript.xml diff --git a/android/source/res/drawable/ic_superscript.xml b/android/app/res/drawable/ic_superscript.xml similarity index 100% rename from android/source/res/drawable/ic_superscript.xml rename to android/app/res/drawable/ic_superscript.xml diff --git a/android/source/res/drawable/ic_undo.xml b/android/app/res/drawable/ic_undo.xml similarity index 100% rename from android/source/res/drawable/ic_undo.xml rename to android/app/res/drawable/ic_undo.xml diff --git a/android/source/res/drawable/impress.png b/android/app/res/drawable/impress.png similarity index 100% rename from android/source/res/drawable/impress.png rename to android/app/res/drawable/impress.png diff --git a/android/source/res/drawable/label_background.xml b/android/app/res/drawable/label_background.xml similarity index 100% rename from android/source/res/drawable/label_background.xml rename to android/app/res/drawable/label_background.xml diff --git a/android/source/res/drawable/writer.png b/android/app/res/drawable/writer.png similarity index 100% rename from android/source/res/drawable/writer.png rename to android/app/res/drawable/writer.png diff --git a/android/source/res/layout/about.xml b/android/app/res/layout/about.xml similarity index 100% rename from android/source/res/layout/about.xml rename to android/app/res/layout/about.xml diff --git a/android/source/res/layout/activity_document_browser.xml b/android/app/res/layout/activity_document_browser.xml similarity index 100% rename from android/source/res/layout/activity_document_browser.xml rename to android/app/res/layout/activity_document_browser.xml diff --git a/android/source/res/layout/activity_main.xml b/android/app/res/layout/activity_main.xml similarity index 100% rename from android/source/res/layout/activity_main.xml rename to android/app/res/layout/activity_main.xml diff --git a/android/source/res/layout/calc_header_popup.xml b/android/app/res/layout/calc_header_popup.xml similarity index 100% rename from android/source/res/layout/calc_header_popup.xml rename to android/app/res/layout/calc_header_popup.xml diff --git a/android/source/res/layout/colorbox.xml b/android/app/res/layout/colorbox.xml similarity index 100% rename from android/source/res/layout/colorbox.xml rename to android/app/res/layout/colorbox.xml diff --git a/android/source/res/layout/document_part_list_layout.xml b/android/app/res/layout/document_part_list_layout.xml similarity index 100% rename from android/source/res/layout/document_part_list_layout.xml rename to android/app/res/layout/document_part_list_layout.xml diff --git a/android/source/res/layout/document_viewer.xml b/android/app/res/layout/document_viewer.xml similarity index 100% rename from android/source/res/layout/document_viewer.xml rename to android/app/res/layout/document_viewer.xml diff --git a/android/source/res/layout/item_recent_files.xml b/android/app/res/layout/item_recent_files.xml similarity index 100% rename from android/source/res/layout/item_recent_files.xml rename to android/app/res/layout/item_recent_files.xml diff --git a/android/source/res/layout/main.xml b/android/app/res/layout/main.xml similarity index 100% rename from android/source/res/layout/main.xml rename to android/app/res/layout/main.xml diff --git a/android/source/res/layout/number_picker.xml b/android/app/res/layout/number_picker.xml similarity index 100% rename from android/source/res/layout/number_picker.xml rename to android/app/res/layout/number_picker.xml diff --git a/android/source/res/layout/password_dialog.xml b/android/app/res/layout/password_dialog.xml similarity index 100% rename from android/source/res/layout/password_dialog.xml rename to android/app/res/layout/password_dialog.xml diff --git a/android/source/res/layout/presentation_mode.xml b/android/app/res/layout/presentation_mode.xml similarity index 100% rename from android/source/res/layout/presentation_mode.xml rename to android/app/res/layout/presentation_mode.xml diff --git a/android/source/res/layout/text_selection_handles.xml b/android/app/res/layout/text_selection_handles.xml similarity index 100% rename from android/source/res/layout/text_selection_handles.xml rename to android/app/res/layout/text_selection_handles.xml diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/app/res/layout/toolbar_bottom.xml similarity index 100% rename from android/source/res/layout/toolbar_bottom.xml rename to android/app/res/layout/toolbar_bottom.xml diff --git a/android/source/res/layout/toolbar_color_picker.xml b/android/app/res/layout/toolbar_color_picker.xml similarity index 100% rename from android/source/res/layout/toolbar_color_picker.xml rename to android/app/res/layout/toolbar_color_picker.xml diff --git a/android/source/res/menu/main.xml b/android/app/res/menu/main.xml similarity index 100% rename from android/source/res/menu/main.xml rename to android/app/res/menu/main.xml diff --git a/android/source/res/menu/view_menu.xml b/android/app/res/menu/view_menu.xml similarity index 100% rename from android/source/res/menu/view_menu.xml rename to android/app/res/menu/view_menu.xml diff --git a/android/source/res/mipmap-hdpi/ic_launcher.png b/android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from android/source/res/mipmap-hdpi/ic_launcher.png rename to android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/android/source/res/mipmap-mdpi/ic_launcher.png b/android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from android/source/res/mipmap-mdpi/ic_launcher.png rename to android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/android/source/res/mipmap-xhdpi/ic_launcher.png b/android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from android/source/res/mipmap-xhdpi/ic_launcher.png rename to android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/source/res/mipmap-xxhdpi/ic_launcher.png b/android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from android/source/res/mipmap-xxhdpi/ic_launcher.png rename to android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/source/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from android/source/res/mipmap-xxxhdpi/ic_launcher.png rename to android/app/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/android/source/res/values-ab/strings.xml b/android/app/res/values-ab/strings.xml similarity index 100% rename from android/source/res/values-ab/strings.xml rename to android/app/res/values-ab/strings.xml diff --git a/android/source/res/values-af/strings.xml b/android/app/res/values-af/strings.xml similarity index 100% rename from android/source/res/values-af/strings.xml rename to android/app/res/values-af/strings.xml diff --git a/android/source/res/values-an/strings.xml b/android/app/res/values-an/strings.xml similarity index 100% rename from android/source/res/values-an/strings.xml rename to android/app/res/values-an/strings.xml diff --git a/android/source/res/values-ast/strings.xml b/android/app/res/values-ast/strings.xml similarity index 100% rename from android/source/res/values-ast/strings.xml rename to android/app/res/values-ast/strings.xml diff --git a/android/source/res/values-be/strings.xml b/android/app/res/values-be/strings.xml similarity index 100% rename from android/source/res/values-be/strings.xml rename to android/app/res/values-be/strings.xml diff --git a/android/source/res/values-brh/strings.xml b/android/app/res/values-brh/strings.xml similarity index 100% rename from android/source/res/values-brh/strings.xml rename to android/app/res/values-brh/strings.xml diff --git a/android/source/res/values-ca/strings.xml b/android/app/res/values-ca/strings.xml similarity index 100% rename from android/source/res/values-ca/strings.xml rename to android/app/res/values-ca/strings.xml diff --git a/android/source/res/values-cs/strings.xml b/android/app/res/values-cs/strings.xml similarity index 100% rename from android/source/res/values-cs/strings.xml rename to android/app/res/values-cs/strings.xml diff --git a/android/source/res/values-cy/strings.xml b/android/app/res/values-cy/strings.xml similarity index 100% rename from android/source/res/values-cy/strings.xml rename to android/app/res/values-cy/strings.xml diff --git a/android/source/res/values-de/strings.xml b/android/app/res/values-de/strings.xml similarity index 100% rename from android/source/res/values-de/strings.xml rename to android/app/res/values-de/strings.xml diff --git a/android/source/res/values-dsb/strings.xml b/android/app/res/values-dsb/strings.xml similarity index 100% rename from android/source/res/values-dsb/strings.xml rename to android/app/res/values-dsb/strings.xml diff --git a/android/source/res/values-el/strings.xml b/android/app/res/values-el/strings.xml similarity index 100% rename from android/source/res/values-el/strings.xml rename to android/app/res/values-el/strings.xml diff --git a/android/source/res/values-eo/strings.xml b/android/app/res/values-eo/strings.xml similarity index 100% rename from android/source/res/values-eo/strings.xml rename to android/app/res/values-eo/strings.xml diff --git a/android/source/res/values-es/strings.xml b/android/app/res/values-es/strings.xml similarity index 100% rename from android/source/res/values-es/strings.xml rename to android/app/res/values-es/strings.xml diff --git a/android/source/res/values-eu/strings.xml b/android/app/res/values-eu/strings.xml similarity index 100% rename from android/source/res/values-eu/strings.xml rename to android/app/res/values-eu/strings.xml diff --git a/android/source/res/values-fa/strings.xml b/android/app/res/values-fa/strings.xml similarity index 100% rename from android/source/res/values-fa/strings.xml rename to android/app/res/values-fa/strings.xml diff --git a/android/source/res/values-fi/strings.xml b/android/app/res/values-fi/strings.xml similarity index 100% rename from android/source/res/values-fi/strings.xml rename to android/app/res/values-fi/strings.xml diff --git a/android/source/res/values-fr/strings.xml b/android/app/res/values-fr/strings.xml similarity index 100% rename from android/source/res/values-fr/strings.xml rename to android/app/res/values-fr/strings.xml diff --git a/android/source/res/values-gl/strings.xml b/android/app/res/values-gl/strings.xml similarity index 100% rename from android/source/res/values-gl/strings.xml rename to android/app/res/values-gl/strings.xml diff --git a/android/source/res/values-hsb/strings.xml b/android/app/res/values-hsb/strings.xml similarity index 100% rename from android/source/res/values-hsb/strings.xml rename to android/app/res/values-hsb/strings.xml diff --git a/android/source/res/values-hu/strings.xml b/android/app/res/values-hu/strings.xml similarity index 100% rename from android/source/res/values-hu/strings.xml rename to android/app/res/values-hu/strings.xml diff --git a/android/source/res/values-hy/strings.xml b/android/app/res/values-hy/strings.xml similarity index 100% rename from android/source/res/values-hy/strings.xml rename to android/app/res/values-hy/strings.xml diff --git a/android/source/res/values-ia/strings.xml b/android/app/res/values-ia/strings.xml similarity index 100% rename from android/source/res/values-ia/strings.xml rename to android/app/res/values-ia/strings.xml diff --git a/android/source/res/values-in/strings.xml b/android/app/res/values-in/strings.xml similarity index 100% rename from android/source/res/values-in/strings.xml rename to android/app/res/values-in/strings.xml diff --git a/android/source/res/values-is/strings.xml b/android/app/res/values-is/strings.xml similarity index 100% rename from android/source/res/values-is/strings.xml rename to android/app/res/values-is/strings.xml diff --git a/android/source/res/values-it/strings.xml b/android/app/res/values-it/strings.xml similarity index 100% rename from android/source/res/values-it/strings.xml rename to android/app/res/values-it/strings.xml diff --git a/android/source/res/values-iw/strings.xml b/android/app/res/values-iw/strings.xml similarity index 100% rename from android/source/res/values-iw/strings.xml rename to android/app/res/values-iw/strings.xml diff --git a/android/source/res/values-ja/strings.xml b/android/app/res/values-ja/strings.xml similarity index 100% rename from android/source/res/values-ja/strings.xml rename to android/app/res/values-ja/strings.xml diff --git a/android/source/res/values-ka/strings.xml b/android/app/res/values-ka/strings.xml similarity index 100% rename from android/source/res/values-ka/strings.xml rename to android/app/res/values-ka/strings.xml diff --git a/android/source/res/values-kk/strings.xml b/android/app/res/values-kk/strings.xml similarity index 100% rename from android/source/res/values-kk/strings.xml rename to android/app/res/values-kk/strings.xml diff --git a/android/source/res/values-kmr/strings.xml b/android/app/res/values-kmr/strings.xml similarity index 100% rename from android/source/res/values-kmr/strings.xml rename to android/app/res/values-kmr/strings.xml diff --git a/android/source/res/values-ne/strings.xml b/android/app/res/values-ne/strings.xml similarity index 100% rename from android/source/res/values-ne/strings.xml rename to android/app/res/values-ne/strings.xml diff --git a/android/source/res/values-night/colors.xml b/android/app/res/values-night/colors.xml similarity index 100% rename from android/source/res/values-night/colors.xml rename to android/app/res/values-night/colors.xml diff --git a/android/source/res/values-nl/strings.xml b/android/app/res/values-nl/strings.xml similarity index 100% rename from android/source/res/values-nl/strings.xml rename to android/app/res/values-nl/strings.xml diff --git a/android/source/res/values-pa/strings.xml b/android/app/res/values-pa/strings.xml similarity index 100% rename from android/source/res/values-pa/strings.xml rename to android/app/res/values-pa/strings.xml diff --git a/android/source/res/values-pl/strings.xml b/android/app/res/values-pl/strings.xml similarity index 100% rename from android/source/res/values-pl/strings.xml rename to android/app/res/values-pl/strings.xml diff --git a/android/source/res/values-pt-rBR/strings.xml b/android/app/res/values-pt-rBR/strings.xml similarity index 100% rename from android/source/res/values-pt-rBR/strings.xml rename to android/app/res/values-pt-rBR/strings.xml diff --git a/android/source/res/values-pt/strings.xml b/android/app/res/values-pt/strings.xml similarity index 100% rename from android/source/res/values-pt/strings.xml rename to android/app/res/values-pt/strings.xml diff --git a/android/source/res/values-ro/strings.xml b/android/app/res/values-ro/strings.xml similarity index 100% rename from android/source/res/values-ro/strings.xml rename to android/app/res/values-ro/strings.xml diff --git a/android/source/res/values-sk/strings.xml b/android/app/res/values-sk/strings.xml similarity index 100% rename from android/source/res/values-sk/strings.xml rename to android/app/res/values-sk/strings.xml diff --git a/android/source/res/values-sl/strings.xml b/android/app/res/values-sl/strings.xml similarity index 100% rename from android/source/res/values-sl/strings.xml rename to android/app/res/values-sl/strings.xml diff --git a/android/source/res/values-tl/strings.xml b/android/app/res/values-tl/strings.xml similarity index 100% rename from android/source/res/values-tl/strings.xml rename to android/app/res/values-tl/strings.xml diff --git a/android/source/res/values-tr/strings.xml b/android/app/res/values-tr/strings.xml similarity index 100% rename from android/source/res/values-tr/strings.xml rename to android/app/res/values-tr/strings.xml diff --git a/android/source/res/values-ug/strings.xml b/android/app/res/values-ug/strings.xml similarity index 100% rename from android/source/res/values-ug/strings.xml rename to android/app/res/values-ug/strings.xml diff --git a/android/source/res/values-uk/strings.xml b/android/app/res/values-uk/strings.xml similarity index 100% rename from android/source/res/values-uk/strings.xml rename to android/app/res/values-uk/strings.xml diff --git a/android/source/res/values-zh-rCN/strings.xml b/android/app/res/values-zh-rCN/strings.xml similarity index 100% rename from android/source/res/values-zh-rCN/strings.xml rename to android/app/res/values-zh-rCN/strings.xml diff --git a/android/source/res/values-zh-rTW/strings.xml b/android/app/res/values-zh-rTW/strings.xml similarity index 100% rename from android/source/res/values-zh-rTW/strings.xml rename to android/app/res/values-zh-rTW/strings.xml diff --git a/android/source/res/values/colors.xml b/android/app/res/values/colors.xml similarity index 100% rename from android/source/res/values/colors.xml rename to android/app/res/values/colors.xml diff --git a/android/source/res/values/dimens.xml b/android/app/res/values/dimens.xml similarity index 100% rename from android/source/res/values/dimens.xml rename to android/app/res/values/dimens.xml diff --git a/android/source/res/values/ids.xml b/android/app/res/values/ids.xml similarity index 100% rename from android/source/res/values/ids.xml rename to android/app/res/values/ids.xml diff --git a/android/source/res/values/strings.xml b/android/app/res/values/strings.xml similarity index 100% rename from android/source/res/values/strings.xml rename to android/app/res/values/strings.xml diff --git a/android/source/res/values/themes.xml b/android/app/res/values/themes.xml similarity index 100% rename from android/source/res/values/themes.xml rename to android/app/res/values/themes.xml diff --git a/android/source/res/xml/file_paths.xml b/android/app/res/xml/file_paths.xml similarity index 100% rename from android/source/res/xml/file_paths.xml rename to android/app/res/xml/file_paths.xml diff --git a/android/source/res/xml/libreoffice_preferences.xml b/android/app/res/xml/libreoffice_preferences.xml similarity index 100% rename from android/source/res/xml/libreoffice_preferences.xml rename to android/app/res/xml/libreoffice_preferences.xml diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/app/src/java/org/libreoffice/AboutDialogFragment.java similarity index 100% rename from android/source/src/java/org/libreoffice/AboutDialogFragment.java rename to android/app/src/java/org/libreoffice/AboutDialogFragment.java diff --git a/android/source/src/java/org/libreoffice/ColorPaletteAdapter.java b/android/app/src/java/org/libreoffice/ColorPaletteAdapter.java similarity index 100% rename from android/source/src/java/org/libreoffice/ColorPaletteAdapter.java rename to android/app/src/java/org/libreoffice/ColorPaletteAdapter.java diff --git a/android/source/src/java/org/libreoffice/ColorPaletteListener.java b/android/app/src/java/org/libreoffice/ColorPaletteListener.java similarity index 100% rename from android/source/src/java/org/libreoffice/ColorPaletteListener.java rename to android/app/src/java/org/libreoffice/ColorPaletteListener.java diff --git a/android/source/src/java/org/libreoffice/ColorPickerAdapter.java b/android/app/src/java/org/libreoffice/ColorPickerAdapter.java similarity index 100% rename from android/source/src/java/org/libreoffice/ColorPickerAdapter.java rename to android/app/src/java/org/libreoffice/ColorPickerAdapter.java diff --git a/android/source/src/java/org/libreoffice/DocumentPartView.java b/android/app/src/java/org/libreoffice/DocumentPartView.java similarity index 100% rename from android/source/src/java/org/libreoffice/DocumentPartView.java rename to android/app/src/java/org/libreoffice/DocumentPartView.java diff --git a/android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java b/android/app/src/java/org/libreoffice/DocumentPartViewListAdapter.java similarity index 100% rename from android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java rename to android/app/src/java/org/libreoffice/DocumentPartViewListAdapter.java diff --git a/android/source/src/java/org/libreoffice/FontController.java b/android/app/src/java/org/libreoffice/FontController.java similarity index 100% rename from android/source/src/java/org/libreoffice/FontController.java rename to android/app/src/java/org/libreoffice/FontController.java diff --git a/android/source/src/java/org/libreoffice/FormattingController.java b/android/app/src/java/org/libreoffice/FormattingController.java similarity index 100% rename from android/source/src/java/org/libreoffice/FormattingController.java rename to android/app/src/java/org/libreoffice/FormattingController.java diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java b/android/app/src/java/org/libreoffice/InvalidationHandler.java similarity index 100% rename from android/source/src/java/org/libreoffice/InvalidationHandler.java rename to android/app/src/java/org/libreoffice/InvalidationHandler.java diff --git a/android/source/src/java/org/libreoffice/LOEvent.java b/android/app/src/java/org/libreoffice/LOEvent.java similarity index 100% rename from android/source/src/java/org/libreoffice/LOEvent.java rename to android/app/src/java/org/libreoffice/LOEvent.java diff --git a/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java b/android/app/src/java/org/libreoffice/LOKitInputConnectionHandler.java similarity index 100% rename from android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java rename to android/app/src/java/org/libreoffice/LOKitInputConnectionHandler.java diff --git a/android/source/src/java/org/libreoffice/LOKitShell.java b/android/app/src/java/org/libreoffice/LOKitShell.java similarity index 100% rename from android/source/src/java/org/libreoffice/LOKitShell.java rename to android/app/src/java/org/libreoffice/LOKitShell.java diff --git a/android/source/src/java/org/libreoffice/LOKitThread.java b/android/app/src/java/org/libreoffice/LOKitThread.java similarity index 100% rename from android/source/src/java/org/libreoffice/LOKitThread.java rename to android/app/src/java/org/libreoffice/LOKitThread.java diff --git a/android/source/src/java/org/libreoffice/LOKitTileProvider.java b/android/app/src/java/org/libreoffice/LOKitTileProvider.java similarity index 100% rename from android/source/src/java/org/libreoffice/LOKitTileProvider.java rename to android/app/src/java/org/libreoffice/LOKitTileProvider.java diff --git a/android/source/src/java/org/libreoffice/LibreOfficeApplication.java b/android/app/src/java/org/libreoffice/LibreOfficeApplication.java similarity index 100% rename from android/source/src/java/org/libreoffice/LibreOfficeApplication.java rename to android/app/src/java/org/libreoffice/LibreOfficeApplication.java diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/app/src/java/org/libreoffice/LibreOfficeMainActivity.java similarity index 100% rename from android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java rename to android/app/src/java/org/libreoffice/LibreOfficeMainActivity.java diff --git a/android/source/src/java/org/libreoffice/PDFDocumentAdapter.java b/android/app/src/java/org/libreoffice/PDFDocumentAdapter.java similarity index 100% rename from android/source/src/java/org/libreoffice/PDFDocumentAdapter.java rename to android/app/src/java/org/libreoffice/PDFDocumentAdapter.java diff --git a/android/source/src/java/org/libreoffice/PasswordDialogFragment.java b/android/app/src/java/org/libreoffice/PasswordDialogFragment.java similarity index 100% rename from android/source/src/java/org/libreoffice/PasswordDialogFragment.java rename to android/app/src/java/org/libreoffice/PasswordDialogFragment.java diff --git a/android/source/src/java/org/libreoffice/PresentationActivity.java b/android/app/src/java/org/libreoffice/PresentationActivity.java similarity index 100% rename from android/source/src/java/org/libreoffice/PresentationActivity.java rename to android/app/src/java/org/libreoffice/PresentationActivity.java diff --git a/android/source/src/java/org/libreoffice/SearchController.java b/android/app/src/java/org/libreoffice/SearchController.java similarity index 100% rename from android/source/src/java/org/libreoffice/SearchController.java rename to android/app/src/java/org/libreoffice/SearchController.java diff --git a/android/source/src/java/org/libreoffice/SettingsActivity.java b/android/app/src/java/org/libreoffice/SettingsActivity.java similarity index 100% rename from android/source/src/java/org/libreoffice/SettingsActivity.java rename to android/app/src/java/org/libreoffice/SettingsActivity.java diff --git a/android/source/src/java/org/libreoffice/ThumbnailCreator.java b/android/app/src/java/org/libreoffice/ThumbnailCreator.java similarity index 100% rename from android/source/src/java/org/libreoffice/ThumbnailCreator.java rename to android/app/src/java/org/libreoffice/ThumbnailCreator.java diff --git a/android/source/src/java/org/libreoffice/TileIdentifier.java b/android/app/src/java/org/libreoffice/TileIdentifier.java similarity index 100% rename from android/source/src/java/org/libreoffice/TileIdentifier.java rename to android/app/src/java/org/libreoffice/TileIdentifier.java diff --git a/android/source/src/java/org/libreoffice/TileProvider.java b/android/app/src/java/org/libreoffice/TileProvider.java similarity index 100% rename from android/source/src/java/org/libreoffice/TileProvider.java rename to android/app/src/java/org/libreoffice/TileProvider.java diff --git a/android/source/src/java/org/libreoffice/TileProviderFactory.java b/android/app/src/java/org/libreoffice/TileProviderFactory.java similarity index 100% rename from android/source/src/java/org/libreoffice/TileProviderFactory.java rename to android/app/src/java/org/libreoffice/TileProviderFactory.java diff --git a/android/source/src/java/org/libreoffice/ToolbarController.java b/android/app/src/java/org/libreoffice/ToolbarController.java similarity index 100% rename from android/source/src/java/org/libreoffice/ToolbarController.java rename to android/app/src/java/org/libreoffice/ToolbarController.java diff --git a/android/source/src/java/org/libreoffice/UNOCommandsController.java b/android/app/src/java/org/libreoffice/UNOCommandsController.java similarity index 100% rename from android/source/src/java/org/libreoffice/UNOCommandsController.java rename to android/app/src/java/org/libreoffice/UNOCommandsController.java diff --git a/android/source/src/java/org/libreoffice/UnitConverter.java b/android/app/src/java/org/libreoffice/UnitConverter.java similarity index 100% rename from android/source/src/java/org/libreoffice/UnitConverter.java rename to android/app/src/java/org/libreoffice/UnitConverter.java diff --git a/android/source/src/java/org/libreoffice/canvas/AdjustLengthLine.java b/android/app/src/java/org/libreoffice/canvas/AdjustLengthLine.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/AdjustLengthLine.java rename to android/app/src/java/org/libreoffice/canvas/AdjustLengthLine.java diff --git a/android/source/src/java/org/libreoffice/canvas/BitmapHandle.java b/android/app/src/java/org/libreoffice/canvas/BitmapHandle.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/BitmapHandle.java rename to android/app/src/java/org/libreoffice/canvas/BitmapHandle.java diff --git a/android/source/src/java/org/libreoffice/canvas/CalcHeaderCell.java b/android/app/src/java/org/libreoffice/canvas/CalcHeaderCell.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/CalcHeaderCell.java rename to android/app/src/java/org/libreoffice/canvas/CalcHeaderCell.java diff --git a/android/source/src/java/org/libreoffice/canvas/CalcSelectionBox.java b/android/app/src/java/org/libreoffice/canvas/CalcSelectionBox.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/CalcSelectionBox.java rename to android/app/src/java/org/libreoffice/canvas/CalcSelectionBox.java diff --git a/android/source/src/java/org/libreoffice/canvas/CanvasElement.java b/android/app/src/java/org/libreoffice/canvas/CanvasElement.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/CanvasElement.java rename to android/app/src/java/org/libreoffice/canvas/CanvasElement.java diff --git a/android/source/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java b/android/app/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java rename to android/app/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java diff --git a/android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java b/android/app/src/java/org/libreoffice/canvas/CommonCanvasElement.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/CommonCanvasElement.java rename to android/app/src/java/org/libreoffice/canvas/CommonCanvasElement.java diff --git a/android/source/src/java/org/libreoffice/canvas/Cursor.java b/android/app/src/java/org/libreoffice/canvas/Cursor.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/Cursor.java rename to android/app/src/java/org/libreoffice/canvas/Cursor.java diff --git a/android/source/src/java/org/libreoffice/canvas/GraphicSelection.java b/android/app/src/java/org/libreoffice/canvas/GraphicSelection.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/GraphicSelection.java rename to android/app/src/java/org/libreoffice/canvas/GraphicSelection.java diff --git a/android/source/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java b/android/app/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java rename to android/app/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java diff --git a/android/source/src/java/org/libreoffice/canvas/ImageUtils.java b/android/app/src/java/org/libreoffice/canvas/ImageUtils.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/ImageUtils.java rename to android/app/src/java/org/libreoffice/canvas/ImageUtils.java diff --git a/android/source/src/java/org/libreoffice/canvas/PageNumberRect.java b/android/app/src/java/org/libreoffice/canvas/PageNumberRect.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/PageNumberRect.java rename to android/app/src/java/org/libreoffice/canvas/PageNumberRect.java diff --git a/android/source/src/java/org/libreoffice/canvas/SelectionHandle.java b/android/app/src/java/org/libreoffice/canvas/SelectionHandle.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/SelectionHandle.java rename to android/app/src/java/org/libreoffice/canvas/SelectionHandle.java diff --git a/android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java b/android/app/src/java/org/libreoffice/canvas/SelectionHandleEnd.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java rename to android/app/src/java/org/libreoffice/canvas/SelectionHandleEnd.java diff --git a/android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java b/android/app/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java rename to android/app/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java diff --git a/android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java b/android/app/src/java/org/libreoffice/canvas/SelectionHandleStart.java similarity index 100% rename from android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java rename to android/app/src/java/org/libreoffice/canvas/SelectionHandleStart.java diff --git a/android/source/src/java/org/libreoffice/overlay/CalcHeadersController.java b/android/app/src/java/org/libreoffice/overlay/CalcHeadersController.java similarity index 100% rename from android/source/src/java/org/libreoffice/overlay/CalcHeadersController.java rename to android/app/src/java/org/libreoffice/overlay/CalcHeadersController.java diff --git a/android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java b/android/app/src/java/org/libreoffice/overlay/CalcHeadersView.java similarity index 100% rename from android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java rename to android/app/src/java/org/libreoffice/overlay/CalcHeadersView.java diff --git a/android/source/src/java/org/libreoffice/overlay/DocumentOverlay.java b/android/app/src/java/org/libreoffice/overlay/DocumentOverlay.java similarity index 100% rename from android/source/src/java/org/libreoffice/overlay/DocumentOverlay.java rename to android/app/src/java/org/libreoffice/overlay/DocumentOverlay.java diff --git a/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java b/android/app/src/java/org/libreoffice/overlay/DocumentOverlayView.java similarity index 100% rename from android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java rename to android/app/src/java/org/libreoffice/overlay/DocumentOverlayView.java diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/app/src/java/org/libreoffice/ui/FileUtilities.java similarity index 100% rename from android/source/src/java/org/libreoffice/ui/FileUtilities.java rename to android/app/src/java/org/libreoffice/ui/FileUtilities.java diff --git a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/app/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java similarity index 100% rename from android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java rename to android/app/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java diff --git a/android/source/src/java/org/libreoffice/ui/PageView.java b/android/app/src/java/org/libreoffice/ui/PageView.java similarity index 100% rename from android/source/src/java/org/libreoffice/ui/PageView.java rename to android/app/src/java/org/libreoffice/ui/PageView.java diff --git a/android/source/src/java/org/libreoffice/ui/RecentFile.java b/android/app/src/java/org/libreoffice/ui/RecentFile.java similarity index 100% rename from android/source/src/java/org/libreoffice/ui/RecentFile.java rename to android/app/src/java/org/libreoffice/ui/RecentFile.java diff --git a/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java b/android/app/src/java/org/libreoffice/ui/RecentFilesAdapter.java similarity index 100% rename from android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java rename to android/app/src/java/org/libreoffice/ui/RecentFilesAdapter.java diff --git a/android/source/src/java/org/mozilla/gecko/OnInterceptTouchListener.java b/android/app/src/java/org/mozilla/gecko/OnInterceptTouchListener.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/OnInterceptTouchListener.java rename to android/app/src/java/org/mozilla/gecko/OnInterceptTouchListener.java diff --git a/android/source/src/java/org/mozilla/gecko/OnSlideSwipeListener.java b/android/app/src/java/org/mozilla/gecko/OnSlideSwipeListener.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/OnSlideSwipeListener.java rename to android/app/src/java/org/mozilla/gecko/OnSlideSwipeListener.java diff --git a/android/source/src/java/org/mozilla/gecko/ZoomConstraints.java b/android/app/src/java/org/mozilla/gecko/ZoomConstraints.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/ZoomConstraints.java rename to android/app/src/java/org/mozilla/gecko/ZoomConstraints.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/Axis.java b/android/app/src/java/org/mozilla/gecko/gfx/Axis.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/Axis.java rename to android/app/src/java/org/mozilla/gecko/gfx/Axis.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java b/android/app/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java rename to android/app/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java b/android/app/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java rename to android/app/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/CairoImage.java b/android/app/src/java/org/mozilla/gecko/gfx/CairoImage.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/CairoImage.java rename to android/app/src/java/org/mozilla/gecko/gfx/CairoImage.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/CairoUtils.java b/android/app/src/java/org/mozilla/gecko/gfx/CairoUtils.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/CairoUtils.java rename to android/app/src/java/org/mozilla/gecko/gfx/CairoUtils.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java b/android/app/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java rename to android/app/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java b/android/app/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java rename to android/app/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java b/android/app/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java rename to android/app/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java b/android/app/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java rename to android/app/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java b/android/app/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java rename to android/app/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/FloatSize.java b/android/app/src/java/org/mozilla/gecko/gfx/FloatSize.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/FloatSize.java rename to android/app/src/java/org/mozilla/gecko/gfx/FloatSize.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/GLController.java b/android/app/src/java/org/mozilla/gecko/gfx/GLController.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/GLController.java rename to android/app/src/java/org/mozilla/gecko/gfx/GLController.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/app/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java rename to android/app/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java b/android/app/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java rename to android/app/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java b/android/app/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java rename to android/app/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/IntSize.java b/android/app/src/java/org/mozilla/gecko/gfx/IntSize.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/IntSize.java rename to android/app/src/java/org/mozilla/gecko/gfx/IntSize.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/app/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java rename to android/app/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/Layer.java b/android/app/src/java/org/mozilla/gecko/gfx/Layer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/Layer.java rename to android/app/src/java/org/mozilla/gecko/gfx/Layer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java b/android/app/src/java/org/mozilla/gecko/gfx/LayerRenderer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java rename to android/app/src/java/org/mozilla/gecko/gfx/LayerRenderer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/app/src/java/org/mozilla/gecko/gfx/LayerView.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/LayerView.java rename to android/app/src/java/org/mozilla/gecko/gfx/LayerView.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java b/android/app/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java rename to android/app/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java b/android/app/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java rename to android/app/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java b/android/app/src/java/org/mozilla/gecko/gfx/PointUtils.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/PointUtils.java rename to android/app/src/java/org/mozilla/gecko/gfx/PointUtils.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/RectUtils.java b/android/app/src/java/org/mozilla/gecko/gfx/RectUtils.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/RectUtils.java rename to android/app/src/java/org/mozilla/gecko/gfx/RectUtils.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java b/android/app/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java rename to android/app/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java b/android/app/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java rename to android/app/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java b/android/app/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java rename to android/app/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java b/android/app/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java rename to android/app/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/SubTile.java b/android/app/src/java/org/mozilla/gecko/gfx/SubTile.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/SubTile.java rename to android/app/src/java/org/mozilla/gecko/gfx/SubTile.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/TextureGenerator.java b/android/app/src/java/org/mozilla/gecko/gfx/TextureGenerator.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/TextureGenerator.java rename to android/app/src/java/org/mozilla/gecko/gfx/TextureGenerator.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/TextureReaper.java b/android/app/src/java/org/mozilla/gecko/gfx/TextureReaper.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/TextureReaper.java rename to android/app/src/java/org/mozilla/gecko/gfx/TextureReaper.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/TileLayer.java b/android/app/src/java/org/mozilla/gecko/gfx/TileLayer.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/TileLayer.java rename to android/app/src/java/org/mozilla/gecko/gfx/TileLayer.java diff --git a/android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java b/android/app/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java rename to android/app/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java diff --git a/android/source/src/java/org/mozilla/gecko/util/FloatUtils.java b/android/app/src/java/org/mozilla/gecko/util/FloatUtils.java similarity index 100% rename from android/source/src/java/org/mozilla/gecko/util/FloatUtils.java rename to android/app/src/java/org/mozilla/gecko/util/FloatUtils.java diff --git a/android/source/src/main/play/listings/en-US/graphics/icon/icon.png b/android/app/src/main/play/listings/en-US/graphics/icon/icon.png similarity index 100% rename from android/source/src/main/play/listings/en-US/graphics/icon/icon.png rename to android/app/src/main/play/listings/en-US/graphics/icon/icon.png diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 0e746d3ac596..99901b64d71b 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -26,4 +26,4 @@ dependencyResolutionManagement { } } -include(":source") +include(":app") diff --git a/configure.ac b/configure.ac index f29b4790d8e8..5311b440167e 100644 --- a/configure.ac +++ b/configure.ac @@ -892,7 +892,7 @@ if test -n "$with_android_ndk"; then # NDK 15 or later toolchain is 64bit-only, except for Windows that we don't support. Using a 64-bit # linker is required if you compile large parts of the code with -g. A 32-bit linker just won't # manage to link the (app-specific) single huge .so that is built for the app in - # android/source/ if there is debug information in a significant part of the object files. + # android/app/ if there is debug information in a significant part of the object files. # (A 64-bit ld.gold grows too much over 10 gigabytes of virtual space when linking such a .so if # all objects have been built with debug information.) case $build_os in diff --git a/libreofficekit/Package_selectionhandles.mk b/libreofficekit/Package_selectionhandles.mk index 106a1059d943..398de1f7d426 100644 --- a/libreofficekit/Package_selectionhandles.mk +++ b/libreofficekit/Package_selectionhandles.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libreofficekit_selectionhandles,$(SRCDIR)/android/source/res/drawable-xhdpi)) +$(eval $(call gb_Package_Package,libreofficekit_selectionhandles,$(SRCDIR)/android/app/res/drawable-xhdpi)) $(eval $(call gb_Package_add_files,libreofficekit_selectionhandles,$(LIBO_SHARE_FOLDER)/libreofficekit,\ handle_image_start.png \