Let's simplify the paths and be less 'experimental'

175 files changed, 9 insertions, 9 deletions

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index e9296dff9277..84c68814c15a 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 24225c0257a1..37f3012e6275 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
index 9364ea837a68..9364ea837a68 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/source/AndroidManifest.xml.in
diff --git a/android/experimental/LOAndroid3/Makefile b/android/source/Makefile
index 346b99526bc8..3bf2c1547aac 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
index 52d06eede74c..52d06eede74c 100644
--- a/android/experimental/LOAndroid3/build.xml
+++ b/android/source/build.xml
diff --git a/android/experimental/LOAndroid3/fonts.conf b/android/source/fonts.conf
index 263648a0aa87..263648a0aa87 100644
--- a/android/experimental/LOAndroid3/fonts.conf
+++ b/android/source/fonts.conf
diff --git a/android/experimental/LOAndroid3/jni/Android.mk b/android/source/jni/Android.mk
index 939a1ea503bb..939a1ea503bb 100644
--- a/android/experimental/LOAndroid3/jni/Android.mk
+++ b/android/source/jni/Android.mk
diff --git a/android/experimental/LOAndroid3/proguard-project.txt b/android/source/proguard-project.txt
index f2fe1559a217..f2fe1559a217 100644
--- a/android/experimental/LOAndroid3/proguard-project.txt
+++ b/android/source/proguard-project.txt
diff --git a/android/experimental/LOAndroid3/project.properties b/android/source/project.properties
index d5ae53d9be96..3580b118d026 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
index 128871826d09..128871826d09 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png
+++ b/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
index 2b60b3167e9f..2b60b3167e9f 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png
+++ b/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
index e6b70451863a..e6b70451863a 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/action_search.png
+++ b/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
index f12e005ebe83..f12e005ebe83 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/action_search_light.png
+++ b/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
index 5b5c2e993103..5b5c2e993103 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
+++ b/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
index 187f45ec19db..187f45ec19db 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png
+++ b/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
index fd234f336406..fd234f336406 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_img.png
+++ b/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
index 84d36608abb1..84d36608abb1 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_split_img.png
+++ b/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
index d5e204429ef3..d5e204429ef3 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/handle_end.png
+++ b/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
index f5dab66a978d..f5dab66a978d 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png
+++ b/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
index b6a8ce79e942..b6a8ce79e942 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/handle_start.png
+++ b/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
index 99301de80f3f..99301de80f3f 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_grid.png
+++ b/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
index c5f6c97b2687..c5f6c97b2687 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_list.png
+++ b/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
index 8c6b6993f3b3..8c6b6993f3b3 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/lo_icon.png
+++ b/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
index 7e8e2a05e2da..7e8e2a05e2da 100644
--- a/android/experimental/LOAndroid3/res/drawable-hdpi/main.png
+++ b/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
index 41a71149e377..41a71149e377 100644
--- a/android/experimental/LOAndroid3/res/drawable-ldpi/lo_icon.png
+++ b/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
index 48b01003c868..48b01003c868 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png
+++ b/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
index 34859155e842..34859155e842 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png
+++ b/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
index 4dc93b8d3a45..4dc93b8d3a45 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
+++ b/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
index bbe053a8a48a..bbe053a8a48a 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png
+++ b/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
index 56058702cfe7..56058702cfe7 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/background.png
+++ b/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
index 4bbd7037f636..4bbd7037f636 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_img.png
+++ b/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
index 3415ac163418..3415ac163418 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_split_img.png
+++ b/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
index 569808ef23d3..569808ef23d3 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/lo_icon.png
+++ b/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
index c696a2c74d5d..c696a2c74d5d 100644
--- a/android/experimental/LOAndroid3/res/drawable-mdpi/shadow.png
+++ b/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
index 1cea427f3ae4..1cea427f3ae4 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png
+++ b/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
index 5117ecd39ac9..5117ecd39ac9 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png
+++ b/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
index 1bc46aa36eed..1bc46aa36eed 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
+++ b/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
index c4621f498ffd..c4621f498ffd 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png
+++ b/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
index 79b9ffd0a285..79b9ffd0a285 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_img.png
+++ b/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
index 8e68c983ad15..8e68c983ad15 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_split_img.png
+++ b/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
index 02e51737fef1..02e51737fef1 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png
+++ b/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
index 15940a2cc85a..15940a2cc85a 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png
+++ b/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
index 9af76544812c..9af76544812c 100644
--- a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_start.png
+++ b/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
index 2e13c60e1653..2e13c60e1653 100644
--- a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png
+++ b/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
index 8b76698e86fb..8b76698e86fb 100644
--- a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png
+++ b/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
index 090f6c270a45..090f6c270a45 100644
--- a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
+++ b/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
index 357bc8be01e5..357bc8be01e5 100644
--- a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png
+++ b/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
index 121ac9aacc46..121ac9aacc46 100644
--- a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_check_grey600_24dp.png
+++ b/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
index f9ae47eded01..f9ae47eded01 100644
--- 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
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
index 873fa7ab8432..873fa7ab8432 100644
--- a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png
+++ b/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
index 77e0aab2221b..77e0aab2221b 100644
--- a/android/experimental/LOAndroid3/res/drawable/bg_striped.xml
+++ b/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
index 9b0e31354b28..9b0e31354b28 100644
--- a/android/experimental/LOAndroid3/res/drawable/bg_striped_split.xml
+++ b/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
index 3ed538ccec34..3ed538ccec34 100644
--- a/android/experimental/LOAndroid3/res/drawable/black_white_gradient.xml
+++ b/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
index 0c0d31444d11..0c0d31444d11 100644
--- a/android/experimental/LOAndroid3/res/drawable/calc.png
+++ b/android/source/res/drawable/calc.png
diff --git a/android/experimental/LOAndroid3/res/drawable/draw.png b/android/source/res/drawable/draw.png
index b3ee11426a04..b3ee11426a04 100644
--- a/android/experimental/LOAndroid3/res/drawable/draw.png
+++ b/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
index 31a0756808b9..31a0756808b9 100644
--- a/android/experimental/LOAndroid3/res/drawable/dummy_page.png
+++ b/android/source/res/drawable/dummy_page.png
diff --git a/android/experimental/LOAndroid3/res/drawable/folder.png b/android/source/res/drawable/folder.png
index 40a65984708d..40a65984708d 100644
--- a/android/experimental/LOAndroid3/res/drawable/folder.png
+++ b/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
index 32b77dfa6e26..32b77dfa6e26 100644
--- a/android/experimental/LOAndroid3/res/drawable/handle_end.png
+++ b/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
index 40a512b3800a..40a512b3800a 100644
--- a/android/experimental/LOAndroid3/res/drawable/handle_end_level.xml
+++ b/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
index 7317eee67d05..7317eee67d05 100644
--- a/android/experimental/LOAndroid3/res/drawable/handle_graphic.png
+++ b/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
index 751eb898b136..751eb898b136 100644
--- a/android/experimental/LOAndroid3/res/drawable/handle_middle.png
+++ b/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
index cf12a0dcdcf3..cf12a0dcdcf3 100644
--- a/android/experimental/LOAndroid3/res/drawable/handle_start.png
+++ b/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
index 22945138d765..22945138d765 100644
--- a/android/experimental/LOAndroid3/res/drawable/handle_start_level.xml
+++ b/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
index 5909f05bf089..5909f05bf089 100644
--- a/android/experimental/LOAndroid3/res/drawable/impress.png
+++ b/android/source/res/drawable/impress.png
diff --git a/android/experimental/LOAndroid3/res/drawable/writer.png b/android/source/res/drawable/writer.png
index 8a4e21e47174..8a4e21e47174 100644
--- a/android/experimental/LOAndroid3/res/drawable/writer.png
+++ b/android/source/res/drawable/writer.png
diff --git a/android/experimental/LOAndroid3/res/layout/about.xml b/android/source/res/layout/about.xml
index 9882ab1a5ddf..9882ab1a5ddf 100644
--- a/android/experimental/LOAndroid3/res/layout/about.xml
+++ b/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
index f54591b35ef4..f54591b35ef4 100644
--- a/android/experimental/LOAndroid3/res/layout/activity_document_browser.xml
+++ b/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
index 63695e584279..63695e584279 100644
--- a/android/experimental/LOAndroid3/res/layout/activity_main.xml
+++ b/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
index 51ce0e0baea0..51ce0e0baea0 100644
--- a/android/experimental/LOAndroid3/res/layout/document_part_list_layout.xml
+++ b/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
index b4f450164039..b4f450164039 100644
--- a/android/experimental/LOAndroid3/res/layout/document_viewer.xml
+++ b/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
index 5242f8f60f31..5242f8f60f31 100644
--- a/android/experimental/LOAndroid3/res/layout/file_explorer_grid_item.xml
+++ b/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
index 1885bd34ed6a..1885bd34ed6a 100644
--- a/android/experimental/LOAndroid3/res/layout/file_grid.xml
+++ b/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
index 48dfb1e31267..48dfb1e31267 100644
--- a/android/experimental/LOAndroid3/res/layout/file_list.xml
+++ b/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
index 17590fc7bfb4..17590fc7bfb4 100644
--- a/android/experimental/LOAndroid3/res/layout/file_list_item.xml
+++ b/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
index da730639d03f..da730639d03f 100644
--- a/android/experimental/LOAndroid3/res/layout/item_in_drawer.xml
+++ b/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
index 0264e28f7e47..0264e28f7e47 100644
--- a/android/experimental/LOAndroid3/res/layout/main.xml
+++ b/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
index 20ad60f3c855..20ad60f3c855 100644
--- a/android/experimental/LOAndroid3/res/layout/navigation_grid_item.xml
+++ b/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
index 0be954d0de0b..0be954d0de0b 100644
--- a/android/experimental/LOAndroid3/res/layout/text_selection_handles.xml
+++ b/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
index d8faa51b4034..d8faa51b4034 100644
--- a/android/experimental/LOAndroid3/res/layout/toolbar.xml
+++ b/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
index 43824875d867..43824875d867 100644
--- a/android/experimental/LOAndroid3/res/menu/context_menu.xml
+++ b/android/source/res/menu/context_menu.xml
diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/source/res/menu/main.xml
index bf19105ebc1c..bf19105ebc1c 100644
--- a/android/experimental/LOAndroid3/res/menu/main.xml
+++ b/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
index 32825b5287cc..32825b5287cc 100644
--- a/android/experimental/LOAndroid3/res/menu/view_menu.xml
+++ b/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
index 441ed82777f1..441ed82777f1 100644
--- a/android/experimental/LOAndroid3/res/values-v21/themes.xml
+++ b/android/source/res/values-v21/themes.xml
diff --git a/android/experimental/LOAndroid3/res/values/arrays.xml b/android/source/res/values/arrays.xml
index 28849afb5395..28849afb5395 100644
--- a/android/experimental/LOAndroid3/res/values/arrays.xml
+++ b/android/source/res/values/arrays.xml
diff --git a/android/experimental/LOAndroid3/res/values/attrs.xml b/android/source/res/values/attrs.xml
index ed7397891d97..ed7397891d97 100644
--- a/android/experimental/LOAndroid3/res/values/attrs.xml
+++ b/android/source/res/values/attrs.xml
diff --git a/android/experimental/LOAndroid3/res/values/colors.xml b/android/source/res/values/colors.xml
index f8e207d4e00e..f8e207d4e00e 100644
--- a/android/experimental/LOAndroid3/res/values/colors.xml
+++ b/android/source/res/values/colors.xml
diff --git a/android/experimental/LOAndroid3/res/values/dimens.xml b/android/source/res/values/dimens.xml
index 1e5d7716f192..1e5d7716f192 100644
--- a/android/experimental/LOAndroid3/res/values/dimens.xml
+++ b/android/source/res/values/dimens.xml
diff --git a/android/experimental/LOAndroid3/res/values/ids.xml b/android/source/res/values/ids.xml
index e57595b743f1..e57595b743f1 100644
--- a/android/experimental/LOAndroid3/res/values/ids.xml
+++ b/android/source/res/values/ids.xml
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/source/res/values/strings.xml
index e43c5a58b6ec..e43c5a58b6ec 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
diff --git a/android/experimental/LOAndroid3/res/values/themes.xml b/android/source/res/values/themes.xml
index 3b865112fbd3..3b865112fbd3 100644
--- a/android/experimental/LOAndroid3/res/values/themes.xml
+++ b/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
index 17256b74b870..17256b74b870 100644
--- a/android/experimental/LOAndroid3/res/xml/libreoffice_preferences.xml
+++ b/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
index 5f72305673c5..5f72305673c5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
+++ b/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
index d3292d5e472d..d3292d5e472d 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdapter.java
+++ b/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
index a22c5fd6f437..a22c5fd6f437 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++ b/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
index 111ad109669d..111ad109669d 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
+++ b/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
index 7067714fd1f6..7067714fd1f6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/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
index 804e7263594f..804e7263594f 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitInputConnectionHandler.java
+++ b/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
index 5c8ce78018a5..5c8ce78018a5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/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
index 0da9681b93c1..0da9681b93c1 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/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
index 00af8d51b1d5..00af8d51b1d5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/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
index 822934f10f4d..822934f10f4d 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/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
index 44f9e6b6f629..44f9e6b6f629 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
+++ b/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
index c453798a108a..c453798a108a 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/SettingsActivity.java
+++ b/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
index 5532d7f90926..5532d7f90926 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
+++ b/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
index bdd7cbcde6a3..bdd7cbcde6a3 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java
+++ b/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
index 9a706962e165..9a706962e165 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
+++ b/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
index 6dff903a12d2..6dff903a12d2 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileProviderFactory.java
+++ b/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
index abd1f3e8d6a7..abd1f3e8d6a7 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
+++ b/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
index 9a581956c9e5..9a581956c9e5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/BitmapHandle.java
+++ b/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
index 51e8801f6b58..51e8801f6b58 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
+++ b/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
index 26789e8d8916..26789e8d8916 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java
+++ b/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
index 101afe4b70ac..101afe4b70ac 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java
+++ b/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
index 1cd30edb7549..1cd30edb7549 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/Cursor.java
+++ b/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
index 773975752319..773975752319 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
+++ b/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
index 0c088e0590d6..0c088e0590d6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
+++ b/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
index fd62444c41be..fd62444c41be 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/ImageUtils.java
+++ b/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
index 38b5dc121932..38b5dc121932 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandle.java
+++ b/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
index c13ad1fc8f7d..c13ad1fc8f7d 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleEnd.java
+++ b/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
index 7415d6d3dadd..7415d6d3dadd 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java
+++ b/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
index af2e7ba7cf0a..af2e7ba7cf0a 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleStart.java
+++ b/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
index 40e4eaadc99e..40e4eaadc99e 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlay.java
+++ b/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
index 8d199e4775f7..8d199e4775f7 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlayView.java
+++ b/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
index 9aa19735bbd4..9aa19735bbd4 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/DocumentProviderFactory.java
+++ b/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
index bbfdecd94d48..bbfdecd94d48 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/IDocumentProvider.java
+++ b/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
index 8effd0f6b73b..8effd0f6b73b 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/IFile.java
+++ b/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
index 820a915a5978..820a915a5978 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
+++ b/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
index cc96ef0a46de..cc96ef0a46de 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalDocumentsProvider.java
+++ b/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
index 8e8115af3758..8e8115af3758 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/storage/local/LocalFile.java
+++ b/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
index b8bb7e922111..b8bb7e922111 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FileUtilities.java
+++ b/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
index 1c2b25f36766..1c2b25f36766 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/FolderIconView.java
+++ b/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
index c50d3a3edd59..c50d3a3edd59 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++ b/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
index 7ac40e4f8049..7ac40e4f8049 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/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
index 76b1a1c686d6..76b1a1c686d6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/PageView.java
+++ b/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
index 56a2038257e1..56a2038257e1 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/WriterViewerActivity.java
+++ b/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
index d0cd3d48a943..d0cd3d48a943 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnInterceptTouchListener.java
+++ b/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
index 29f50ebf49a6..29f50ebf49a6 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnSlideSwipeListener.java
+++ b/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
index eba0dfe54aff..eba0dfe54aff 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ZoomConstraints.java
+++ b/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
index 61407cb724cd..61407cb724cd 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Axis.java
+++ b/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
index a616fcc4da43..a616fcc4da43 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java
+++ b/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
index 078aa41baee7..078aa41baee7 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java
+++ b/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
index 5a18a4bb1995..5a18a4bb1995 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoImage.java
+++ b/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
index e0db6530d5c8..e0db6530d5c8 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoUtils.java
+++ b/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
index e11c91c59fcc..e11c91c59fcc 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
+++ b/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
index f860cd9b4be2..f860cd9b4be2 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java
+++ b/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
index f622c44ff912..f622c44ff912 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java
+++ b/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
index ea95c032e8f3..ea95c032e8f3 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
+++ b/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
index e86494c20bde..e86494c20bde 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java
+++ b/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
index 7b183731154d..7b183731154d 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java
+++ b/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
index e296f4760f68..e296f4760f68 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLController.java
+++ b/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
index bb6e3d04e4fb..bb6e3d04e4fb 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/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
index 35b417593acf..35b417593acf 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java
+++ b/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
index d460c19e1c2f..d460c19e1c2f 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/InputConnectionHandler.java
+++ b/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
index b0741d2f68d6..b0741d2f68d6 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/IntSize.java
+++ b/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
index eac6b1bb4143..eac6b1bb4143 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
+++ b/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
index b7fee29fc943..b7fee29fc943 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java
+++ b/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
index b1aea3616d6c..b1aea3616d6c 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
+++ b/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
index 88d93cad99f6..88d93cad99f6 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ b/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
index 99f203961a74..99f203961a74 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java
+++ b/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
index 829ffd555feb..829ffd555feb 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomController.java
+++ b/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
index 88e1b216c61b..88e1b216c61b 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java
+++ b/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
index 4eb07a31f147..4eb07a31f147 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PointUtils.java
+++ b/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
index 8c1670f0f11f..8c1670f0f11f 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RectUtils.java
+++ b/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
index 06f82f158366..06f82f158366 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java
+++ b/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
index 09229d88bfcc..09229d88bfcc 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java
+++ b/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
index 1d901a02a14b..1d901a02a14b 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java
+++ b/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
index 0bc271678368..0bc271678368 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java
+++ b/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
index 42750df62838..42750df62838 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
+++ b/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
index 5a752e3c71a8..5a752e3c71a8 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java
+++ b/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
index 023433a888c3..023433a888c3 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextLayer.java
+++ b/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
index 15272618d337..15272618d337 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureGenerator.java
+++ b/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
index 3063e5bf8412..3063e5bf8412 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextureReaper.java
+++ b/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
index 3d0ff1fede66..3d0ff1fede66 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java
+++ b/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
index 1c227de20b2d..1c227de20b2d 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java
+++ b/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
index f8b5c2e055dc..f8b5c2e055dc 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java
+++ b/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
index a48266c573d8..a48266c573d8 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/util/FloatUtils.java
+++ b/android/source/src/java/org/mozilla/gecko/util/FloatUtils.java