From 940b4d1848e8c70ab7642901a68594e8016caffc Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 27 Apr 2024 18:51:28 +0200
Subject: Adding upstream version 1:7.0.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 android/source/res/anim/fab_close.xml              |  19 +
 android/source/res/anim/fab_open.xml               |  19 +
 android/source/res/drawable-hdpi/action_search.png | Bin 0 -> 1759 bytes
 .../res/drawable-hdpi/action_search_light.png      | Bin 0 -> 1764 bytes
 .../source/res/drawable-hdpi/handle_alias_end.xml  |   5 +
 .../res/drawable-hdpi/handle_alias_middle.xml      |   5 +
 .../res/drawable-hdpi/handle_alias_start.xml       |   5 +
 .../source/res/drawable-hdpi/ic_format_bold.xml    |   5 +
 .../source/res/drawable-hdpi/ic_format_italic.xml  |   5 +
 .../res/drawable-hdpi/ic_format_strikethrough.xml  |   5 +
 .../res/drawable-hdpi/ic_format_underlined.xml     |   5 +
 android/source/res/drawable-hdpi/ic_keyboard.xml   |   5 +
 android/source/res/drawable-hdpi/ic_menu.xml       |   5 +
 .../source/res/drawable-hdpi/ic_text_format.xml    |   5 +
 .../res/drawable-hdpi/light_view_as_grid.png       | Bin 0 -> 1210 bytes
 .../res/drawable-hdpi/light_view_as_list.png       | Bin 0 -> 1363 bytes
 android/source/res/drawable-hdpi/lo_icon.png       | Bin 0 -> 1950 bytes
 android/source/res/drawable-mdpi/background.png    | Bin 0 -> 6511 bytes
 android/source/res/drawable-mdpi/lo_icon.png       | Bin 0 -> 1180 bytes
 android/source/res/drawable-mdpi/shadow.png        | Bin 0 -> 874 bytes
 .../source/res/drawable-xhdpi/handle_image_end.png | Bin 0 -> 413 bytes
 .../res/drawable-xhdpi/handle_image_middle.png     | Bin 0 -> 615 bytes
 .../res/drawable-xhdpi/handle_image_start.png      | Bin 0 -> 422 bytes
 .../res/drawable-xxxhdpi/ic_check_black_24dp.png   | Bin 0 -> 277 bytes
 .../ic_format_align_center_black_24dp.png          | Bin 0 -> 122 bytes
 .../ic_format_align_justify_black_24dp.png         | Bin 0 -> 117 bytes
 .../ic_format_align_left_black_24dp.png            | Bin 0 -> 122 bytes
 .../ic_format_align_right_black_24dp.png           | Bin 0 -> 122 bytes
 .../drawable-xxxhdpi/ic_format_bold_black_24dp.png | Bin 0 -> 468 bytes
 .../ic_format_italic_black_24dp.png                | Bin 0 -> 337 bytes
 .../ic_format_list_bulleted_black_24dp.png         | Bin 0 -> 356 bytes
 .../ic_format_list_numbered_black_24dp.png         | Bin 0 -> 324 bytes
 .../ic_format_strikethrough_black_24dp.png         | Bin 0 -> 131 bytes
 .../ic_format_underlined_black_24dp.png            | Bin 0 -> 489 bytes
 .../drawable-xxxhdpi/ic_keyboard_black_24dp.png    | Bin 0 -> 301 bytes
 .../res/drawable-xxxhdpi/ic_menu_black_24dp.png    | Bin 0 -> 116 bytes
 .../res/drawable-xxxhdpi/ic_redo_black_24dp.png    | Bin 0 -> 615 bytes
 .../res/drawable-xxxhdpi/ic_search_black_24dp.png  | Bin 0 -> 868 bytes
 .../ic_search_direction_down_black_24dp.png        | Bin 0 -> 256 bytes
 .../ic_search_direction_up_black_24dp.png          | Bin 0 -> 261 bytes
 .../drawable-xxxhdpi/ic_text_format_black_24dp.png | Bin 0 -> 641 bytes
 .../res/drawable-xxxhdpi/ic_undo_black_24dp.png    | Bin 0 -> 601 bytes
 .../drawable-xxxhdpi/image_button_background.xml   |   6 +
 android/source/res/drawable/calc.png               | Bin 0 -> 14818 bytes
 android/source/res/drawable/draw.png               | Bin 0 -> 18445 bytes
 android/source/res/drawable/dummy_page.png         | Bin 0 -> 49117 bytes
 android/source/res/drawable/ic_add_black_24dp.xml  |   9 +
 .../res/drawable/ic_arrow_back_black_24dp.xml      |   9 +
 android/source/res/drawable/ic_check.xml           |   5 +
 .../source/res/drawable/ic_cloud_black_24dp.xml    |   9 +
 .../res/drawable/ic_content_copy_black_24dp.xml    |   9 +
 .../res/drawable/ic_content_cut_black_24dp.xml     |   9 +
 .../res/drawable/ic_content_paste_black_24dp.xml   |   9 +
 .../source/res/drawable/ic_done_all_white_12dp.xml |  10 +
 android/source/res/drawable/ic_done_white_12dp.xml |  10 +
 .../res/drawable/ic_filter_list_black_24dp.xml     |   9 +
 .../source/res/drawable/ic_folder_black_24dp.xml   |   5 +
 .../source/res/drawable/ic_format_align_center.xml |   5 +
 .../res/drawable/ic_format_align_justify.xml       |   5 +
 .../source/res/drawable/ic_format_align_left.xml   |   5 +
 .../source/res/drawable/ic_format_align_right.xml  |   5 +
 android/source/res/drawable/ic_format_bullets.xml  |   4 +
 .../res/drawable/ic_format_clear_black_24dp.xml    |   9 +
 .../source/res/drawable/ic_format_numbering.xml    |   4 +
 .../source/res/drawable/ic_grid_off_black_24dp.xml |   9 +
 .../source/res/drawable/ic_grid_on_black_24dp.xml  |   9 +
 android/source/res/drawable/ic_grow.xml            |  16 +
 .../drawable/ic_insert_drive_file_black_24dp.xml   |   7 +
 .../drawable/ic_keyboard_backspace_black_24dp.xml  |   9 +
 android/source/res/drawable/ic_line.xml            |  12 +
 android/source/res/drawable/ic_menu_back.png       | Bin 0 -> 1900 bytes
 android/source/res/drawable/ic_rect.xml            |  13 +
 android/source/res/drawable/ic_redo.xml            |   5 +
 .../source/res/drawable/ic_sd_card_black_24dp.xml  |   9 +
 android/source/res/drawable/ic_search.xml          |   5 +
 .../res/drawable/ic_search_direction_down.xml      |   5 +
 .../source/res/drawable/ic_search_direction_up.xml |   5 +
 .../source/res/drawable/ic_settings_black_24dp.xml |   9 +
 android/source/res/drawable/ic_shrink.xml          |  16 +
 android/source/res/drawable/ic_sort_black_24dp.xml |  13 +
 .../source/res/drawable/ic_storage_black_24dp.xml  |   9 +
 android/source/res/drawable/ic_subscript.xml       |  10 +
 android/source/res/drawable/ic_superscript.xml     |  20 +
 android/source/res/drawable/ic_undo.xml            |   5 +
 android/source/res/drawable/ic_usb_black_24dp.xml  |   7 +
 android/source/res/drawable/impress.png            | Bin 0 -> 13936 bytes
 android/source/res/drawable/label_background.xml   |   9 +
 android/source/res/drawable/writer.png             | Bin 0 -> 15878 bytes
 android/source/res/layout/about.xml                |  45 ++
 .../res/layout/activity_directory_browser.xml      |   6 +
 .../res/layout/activity_document_browser.xml       | 264 ++++++++++
 android/source/res/layout/activity_main.xml        | 146 ++++++
 android/source/res/layout/calc_header_popup.xml    |  90 ++++
 android/source/res/layout/colorbox.xml             |  15 +
 .../res/layout/document_part_list_layout.xml       |  22 +
 android/source/res/layout/document_viewer.xml      |  33 ++
 .../source/res/layout/file_explorer_grid_item.xml  |  42 ++
 android/source/res/layout/file_grid.xml            |  25 +
 android/source/res/layout/file_list.xml            |  20 +
 android/source/res/layout/file_list_item.xml       |  58 +++
 .../res/layout/fragment_directory_browser.xml      |  71 +++
 android/source/res/layout/item_recent_files.xml    |  38 ++
 android/source/res/layout/main.xml                 |  22 +
 android/source/res/layout/number_picker.xml        | 130 +++++
 android/source/res/layout/password_dialog.xml      |  17 +
 android/source/res/layout/presentation_mode.xml    |  45 ++
 .../source/res/layout/text_selection_handles.xml   |  14 +
 android/source/res/layout/toolbar_bottom.xml       | 552 +++++++++++++++++++++
 android/source/res/layout/toolbar_color_picker.xml |  55 ++
 android/source/res/menu/context_menu.xml           |   7 +
 android/source/res/menu/main.xml                   | 146 ++++++
 android/source/res/menu/navigation_menu.xml        |  35 ++
 android/source/res/menu/view_menu.xml              |  65 +++
 android/source/res/mipmap-hdpi/ic_launcher.png     | Bin 0 -> 1529 bytes
 android/source/res/mipmap-mdpi/ic_launcher.png     | Bin 0 -> 950 bytes
 android/source/res/mipmap-xhdpi/ic_launcher.png    | Bin 0 -> 2158 bytes
 android/source/res/mipmap-xxhdpi/ic_launcher.png   | Bin 0 -> 5007 bytes
 android/source/res/mipmap-xxxhdpi/ic_launcher.png  | Bin 0 -> 7896 bytes
 android/source/res/values-de/strings.xml           | 244 +++++++++
 android/source/res/values-tr/strings.xml           | 244 +++++++++
 android/source/res/values/arrays.xml               |  62 +++
 android/source/res/values/colors.xml               | 127 +++++
 android/source/res/values/dimens.xml               |  18 +
 android/source/res/values/ids.xml                  |   4 +
 android/source/res/values/integers.xml             |   6 +
 android/source/res/values/strings.xml              | 244 +++++++++
 android/source/res/values/themes.xml               |  32 ++
 .../res/xml/documentprovider_preferences.xml       |  38 ++
 android/source/res/xml/file_paths.xml              |   4 +
 android/source/res/xml/libreoffice_preferences.xml |  59 +++
 130 files changed, 3471 insertions(+)
 create mode 100644 android/source/res/anim/fab_close.xml
 create mode 100644 android/source/res/anim/fab_open.xml
 create mode 100644 android/source/res/drawable-hdpi/action_search.png
 create mode 100644 android/source/res/drawable-hdpi/action_search_light.png
 create mode 100644 android/source/res/drawable-hdpi/handle_alias_end.xml
 create mode 100644 android/source/res/drawable-hdpi/handle_alias_middle.xml
 create mode 100644 android/source/res/drawable-hdpi/handle_alias_start.xml
 create mode 100644 android/source/res/drawable-hdpi/ic_format_bold.xml
 create mode 100644 android/source/res/drawable-hdpi/ic_format_italic.xml
 create mode 100644 android/source/res/drawable-hdpi/ic_format_strikethrough.xml
 create mode 100644 android/source/res/drawable-hdpi/ic_format_underlined.xml
 create mode 100644 android/source/res/drawable-hdpi/ic_keyboard.xml
 create mode 100644 android/source/res/drawable-hdpi/ic_menu.xml
 create mode 100644 android/source/res/drawable-hdpi/ic_text_format.xml
 create mode 100644 android/source/res/drawable-hdpi/light_view_as_grid.png
 create mode 100644 android/source/res/drawable-hdpi/light_view_as_list.png
 create mode 100644 android/source/res/drawable-hdpi/lo_icon.png
 create mode 100644 android/source/res/drawable-mdpi/background.png
 create mode 100644 android/source/res/drawable-mdpi/lo_icon.png
 create mode 100644 android/source/res/drawable-mdpi/shadow.png
 create mode 100644 android/source/res/drawable-xhdpi/handle_image_end.png
 create mode 100644 android/source/res/drawable-xhdpi/handle_image_middle.png
 create mode 100644 android/source/res/drawable-xhdpi/handle_image_start.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_redo_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_search_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_search_direction_down_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_search_direction_up_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_undo_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/image_button_background.xml
 create mode 100644 android/source/res/drawable/calc.png
 create mode 100644 android/source/res/drawable/draw.png
 create mode 100644 android/source/res/drawable/dummy_page.png
 create mode 100644 android/source/res/drawable/ic_add_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_arrow_back_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_check.xml
 create mode 100644 android/source/res/drawable/ic_cloud_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_content_copy_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_content_cut_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_content_paste_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_done_all_white_12dp.xml
 create mode 100644 android/source/res/drawable/ic_done_white_12dp.xml
 create mode 100644 android/source/res/drawable/ic_filter_list_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_folder_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_format_align_center.xml
 create mode 100644 android/source/res/drawable/ic_format_align_justify.xml
 create mode 100644 android/source/res/drawable/ic_format_align_left.xml
 create mode 100644 android/source/res/drawable/ic_format_align_right.xml
 create mode 100644 android/source/res/drawable/ic_format_bullets.xml
 create mode 100644 android/source/res/drawable/ic_format_clear_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_format_numbering.xml
 create mode 100644 android/source/res/drawable/ic_grid_off_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_grid_on_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_grow.xml
 create mode 100644 android/source/res/drawable/ic_insert_drive_file_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_line.xml
 create mode 100644 android/source/res/drawable/ic_menu_back.png
 create mode 100644 android/source/res/drawable/ic_rect.xml
 create mode 100644 android/source/res/drawable/ic_redo.xml
 create mode 100644 android/source/res/drawable/ic_sd_card_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_search.xml
 create mode 100644 android/source/res/drawable/ic_search_direction_down.xml
 create mode 100644 android/source/res/drawable/ic_search_direction_up.xml
 create mode 100644 android/source/res/drawable/ic_settings_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_shrink.xml
 create mode 100644 android/source/res/drawable/ic_sort_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_storage_black_24dp.xml
 create mode 100644 android/source/res/drawable/ic_subscript.xml
 create mode 100644 android/source/res/drawable/ic_superscript.xml
 create mode 100644 android/source/res/drawable/ic_undo.xml
 create mode 100644 android/source/res/drawable/ic_usb_black_24dp.xml
 create mode 100644 android/source/res/drawable/impress.png
 create mode 100644 android/source/res/drawable/label_background.xml
 create mode 100644 android/source/res/drawable/writer.png
 create mode 100644 android/source/res/layout/about.xml
 create mode 100644 android/source/res/layout/activity_directory_browser.xml
 create mode 100644 android/source/res/layout/activity_document_browser.xml
 create mode 100644 android/source/res/layout/activity_main.xml
 create mode 100644 android/source/res/layout/calc_header_popup.xml
 create mode 100644 android/source/res/layout/colorbox.xml
 create mode 100644 android/source/res/layout/document_part_list_layout.xml
 create mode 100644 android/source/res/layout/document_viewer.xml
 create mode 100644 android/source/res/layout/file_explorer_grid_item.xml
 create mode 100644 android/source/res/layout/file_grid.xml
 create mode 100644 android/source/res/layout/file_list.xml
 create mode 100644 android/source/res/layout/file_list_item.xml
 create mode 100644 android/source/res/layout/fragment_directory_browser.xml
 create mode 100644 android/source/res/layout/item_recent_files.xml
 create mode 100644 android/source/res/layout/main.xml
 create mode 100644 android/source/res/layout/number_picker.xml
 create mode 100644 android/source/res/layout/password_dialog.xml
 create mode 100644 android/source/res/layout/presentation_mode.xml
 create mode 100644 android/source/res/layout/text_selection_handles.xml
 create mode 100644 android/source/res/layout/toolbar_bottom.xml
 create mode 100644 android/source/res/layout/toolbar_color_picker.xml
 create mode 100644 android/source/res/menu/context_menu.xml
 create mode 100644 android/source/res/menu/main.xml
 create mode 100644 android/source/res/menu/navigation_menu.xml
 create mode 100644 android/source/res/menu/view_menu.xml
 create mode 100644 android/source/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 android/source/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 android/source/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 android/source/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 android/source/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 android/source/res/values-de/strings.xml
 create mode 100644 android/source/res/values-tr/strings.xml
 create mode 100644 android/source/res/values/arrays.xml
 create mode 100644 android/source/res/values/colors.xml
 create mode 100644 android/source/res/values/dimens.xml
 create mode 100644 android/source/res/values/ids.xml
 create mode 100644 android/source/res/values/integers.xml
 create mode 100644 android/source/res/values/strings.xml
 create mode 100644 android/source/res/values/themes.xml
 create mode 100644 android/source/res/xml/documentprovider_preferences.xml
 create mode 100644 android/source/res/xml/file_paths.xml
 create mode 100644 android/source/res/xml/libreoffice_preferences.xml

(limited to 'android/source/res')

diff --git a/android/source/res/anim/fab_close.xml b/android/source/res/anim/fab_close.xml
new file mode 100644
index 000000000..c798ddaba
--- /dev/null
+++ b/android/source/res/anim/fab_close.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true">
+    <scale
+        android:duration="300"
+        android:fromXScale="1.0"
+        android:fromYScale="1.0"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:pivotX="100%p"
+        android:pivotY="100%p"
+        android:toXScale="0.0"
+        android:toYScale="0.0" />
+
+    <alpha
+        android:duration="300"
+        android:fromAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toAlpha="0.0" />
+</set>
diff --git a/android/source/res/anim/fab_open.xml b/android/source/res/anim/fab_open.xml
new file mode 100644
index 000000000..30071af8a
--- /dev/null
+++ b/android/source/res/anim/fab_open.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true">
+    <scale
+        android:duration="300"
+        android:fromXScale="0.0"
+        android:fromYScale="0.0"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:pivotX="100%p"
+        android:pivotY="100%p"
+        android:toXScale="1.0"
+        android:toYScale="1.0" />
+
+    <alpha
+        android:duration="300"
+        android:fromAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toAlpha="1.0" />
+</set>
diff --git a/android/source/res/drawable-hdpi/action_search.png b/android/source/res/drawable-hdpi/action_search.png
new file mode 100644
index 000000000..e6b704518
Binary files /dev/null and b/android/source/res/drawable-hdpi/action_search.png differ
diff --git a/android/source/res/drawable-hdpi/action_search_light.png b/android/source/res/drawable-hdpi/action_search_light.png
new file mode 100644
index 000000000..f12e005eb
Binary files /dev/null and b/android/source/res/drawable-hdpi/action_search_light.png differ
diff --git a/android/source/res/drawable-hdpi/handle_alias_end.xml b/android/source/res/drawable-hdpi/handle_alias_end.xml
new file mode 100644
index 000000000..83198618a
--- /dev/null
+++ b/android/source/res/drawable-hdpi/handle_alias_end.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/handle_image_end"
+    android:tint="@color/handle_color"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/handle_alias_middle.xml b/android/source/res/drawable-hdpi/handle_alias_middle.xml
new file mode 100644
index 000000000..a8587f66d
--- /dev/null
+++ b/android/source/res/drawable-hdpi/handle_alias_middle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/handle_image_middle"
+    android:tint="@color/handle_color"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/handle_alias_start.xml b/android/source/res/drawable-hdpi/handle_alias_start.xml
new file mode 100644
index 000000000..df104709f
--- /dev/null
+++ b/android/source/res/drawable-hdpi/handle_alias_start.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/handle_image_start"
+    android:tint="@color/handle_color"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/ic_format_bold.xml b/android/source/res/drawable-hdpi/ic_format_bold.xml
new file mode 100644
index 000000000..a3519d449
--- /dev/null
+++ b/android/source/res/drawable-hdpi/ic_format_bold.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_bold_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/ic_format_italic.xml b/android/source/res/drawable-hdpi/ic_format_italic.xml
new file mode 100644
index 000000000..7a3e9872d
--- /dev/null
+++ b/android/source/res/drawable-hdpi/ic_format_italic.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_italic_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/ic_format_strikethrough.xml b/android/source/res/drawable-hdpi/ic_format_strikethrough.xml
new file mode 100644
index 000000000..1aaa1d25f
--- /dev/null
+++ b/android/source/res/drawable-hdpi/ic_format_strikethrough.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_strikethrough_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/ic_format_underlined.xml b/android/source/res/drawable-hdpi/ic_format_underlined.xml
new file mode 100644
index 000000000..c1797e211
--- /dev/null
+++ b/android/source/res/drawable-hdpi/ic_format_underlined.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_underlined_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
diff --git a/android/source/res/drawable-hdpi/ic_keyboard.xml b/android/source/res/drawable-hdpi/ic_keyboard.xml
new file mode 100644
index 000000000..00902169d
--- /dev/null
+++ b/android/source/res/drawable-hdpi/ic_keyboard.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_keyboard_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/ic_menu.xml b/android/source/res/drawable-hdpi/ic_menu.xml
new file mode 100644
index 000000000..3d9b9c9ed
--- /dev/null
+++ b/android/source/res/drawable-hdpi/ic_menu.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_menu_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/ic_text_format.xml b/android/source/res/drawable-hdpi/ic_text_format.xml
new file mode 100644
index 000000000..c070dddb7
--- /dev/null
+++ b/android/source/res/drawable-hdpi/ic_text_format.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_text_format_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable-hdpi/light_view_as_grid.png b/android/source/res/drawable-hdpi/light_view_as_grid.png
new file mode 100644
index 000000000..99301de80
Binary files /dev/null and b/android/source/res/drawable-hdpi/light_view_as_grid.png differ
diff --git a/android/source/res/drawable-hdpi/light_view_as_list.png b/android/source/res/drawable-hdpi/light_view_as_list.png
new file mode 100644
index 000000000..c5f6c97b2
Binary files /dev/null and b/android/source/res/drawable-hdpi/light_view_as_list.png differ
diff --git a/android/source/res/drawable-hdpi/lo_icon.png b/android/source/res/drawable-hdpi/lo_icon.png
new file mode 100644
index 000000000..d03373b9c
Binary files /dev/null and b/android/source/res/drawable-hdpi/lo_icon.png differ
diff --git a/android/source/res/drawable-mdpi/background.png b/android/source/res/drawable-mdpi/background.png
new file mode 100644
index 000000000..56058702c
Binary files /dev/null and b/android/source/res/drawable-mdpi/background.png differ
diff --git a/android/source/res/drawable-mdpi/lo_icon.png b/android/source/res/drawable-mdpi/lo_icon.png
new file mode 100644
index 000000000..48e90bd1f
Binary files /dev/null and b/android/source/res/drawable-mdpi/lo_icon.png differ
diff --git a/android/source/res/drawable-mdpi/shadow.png b/android/source/res/drawable-mdpi/shadow.png
new file mode 100644
index 000000000..c696a2c74
Binary files /dev/null and b/android/source/res/drawable-mdpi/shadow.png differ
diff --git a/android/source/res/drawable-xhdpi/handle_image_end.png b/android/source/res/drawable-xhdpi/handle_image_end.png
new file mode 100644
index 000000000..b6e943bc0
Binary files /dev/null and b/android/source/res/drawable-xhdpi/handle_image_end.png differ
diff --git a/android/source/res/drawable-xhdpi/handle_image_middle.png b/android/source/res/drawable-xhdpi/handle_image_middle.png
new file mode 100644
index 000000000..4d28b4ab4
Binary files /dev/null and b/android/source/res/drawable-xhdpi/handle_image_middle.png differ
diff --git a/android/source/res/drawable-xhdpi/handle_image_start.png b/android/source/res/drawable-xhdpi/handle_image_start.png
new file mode 100644
index 000000000..3bd7a4cb3
Binary files /dev/null and b/android/source/res/drawable-xhdpi/handle_image_start.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png
new file mode 100644
index 000000000..2f6d6386d
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png
new file mode 100644
index 000000000..b20b21b03
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png
new file mode 100644
index 000000000..15eece7a4
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png
new file mode 100644
index 000000000..c1d927a28
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png
new file mode 100644
index 000000000..e5b306391
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png
new file mode 100644
index 000000000..4d8b8f47b
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png
new file mode 100644
index 000000000..cf85387d5
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png
new file mode 100644
index 000000000..dde94b8f7
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png
new file mode 100644
index 000000000..c1cf9519d
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png
new file mode 100644
index 000000000..f94704e31
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png
new file mode 100644
index 000000000..8a2adce40
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png
new file mode 100644
index 000000000..ba4d5be6d
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png
new file mode 100644
index 000000000..5c747ed00
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_redo_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_redo_black_24dp.png
new file mode 100644
index 000000000..40f107549
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_redo_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_search_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..21be57299
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_search_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_search_direction_down_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_search_direction_down_black_24dp.png
new file mode 100644
index 000000000..ad852e3e6
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_search_direction_down_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_search_direction_up_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_search_direction_up_black_24dp.png
new file mode 100644
index 000000000..99c6e3e1c
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_search_direction_up_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png
new file mode 100644
index 000000000..f38063688
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_undo_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_undo_black_24dp.png
new file mode 100644
index 000000000..9ca7eb73e
Binary files /dev/null and b/android/source/res/drawable-xxxhdpi/ic_undo_black_24dp.png differ
diff --git a/android/source/res/drawable-xxxhdpi/image_button_background.xml b/android/source/res/drawable-xxxhdpi/image_button_background.xml
new file mode 100644
index 000000000..db8b67b17
--- /dev/null
+++ b/android/source/res/drawable-xxxhdpi/image_button_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/button_selected_background" android:state_pressed="true"/>
+    <item android:drawable="@color/button_selected_background" android:state_selected="true" />
+    <item android:drawable="@android:color/transparent" android:state_selected="false" />
+</selector>
\ No newline at end of file
diff --git a/android/source/res/drawable/calc.png b/android/source/res/drawable/calc.png
new file mode 100644
index 000000000..0c0d31444
Binary files /dev/null and b/android/source/res/drawable/calc.png differ
diff --git a/android/source/res/drawable/draw.png b/android/source/res/drawable/draw.png
new file mode 100644
index 000000000..b3ee11426
Binary files /dev/null and b/android/source/res/drawable/draw.png differ
diff --git a/android/source/res/drawable/dummy_page.png b/android/source/res/drawable/dummy_page.png
new file mode 100644
index 000000000..31a075680
Binary files /dev/null and b/android/source/res/drawable/dummy_page.png differ
diff --git a/android/source/res/drawable/ic_add_black_24dp.xml b/android/source/res/drawable/ic_add_black_24dp.xml
new file mode 100644
index 000000000..0258249cc
--- /dev/null
+++ b/android/source/res/drawable/ic_add_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_arrow_back_black_24dp.xml b/android/source/res/drawable/ic_arrow_back_black_24dp.xml
new file mode 100644
index 000000000..beafea395
--- /dev/null
+++ b/android/source/res/drawable/ic_arrow_back_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_check.xml b/android/source/res/drawable/ic_check.xml
new file mode 100644
index 000000000..f60b0d992
--- /dev/null
+++ b/android/source/res/drawable/ic_check.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_check_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_cloud_black_24dp.xml b/android/source/res/drawable/ic_cloud_black_24dp.xml
new file mode 100644
index 000000000..e0940ca0e
--- /dev/null
+++ b/android/source/res/drawable/ic_cloud_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml b/android/source/res/drawable/ic_content_copy_black_24dp.xml
new file mode 100644
index 000000000..8a894a3bc
--- /dev/null
+++ b/android/source/res/drawable/ic_content_copy_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml b/android/source/res/drawable/ic_content_cut_black_24dp.xml
new file mode 100644
index 000000000..1c0f96a37
--- /dev/null
+++ b/android/source/res/drawable/ic_content_cut_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.64,7.64c0.23,-0.5 0.36,-1.05 0.36,-1.64 0,-2.21 -1.79,-4 -4,-4S2,3.79 2,6s1.79,4 4,4c0.59,0 1.14,-0.13 1.64,-0.36L10,12l-2.36,2.36C7.14,14.13 6.59,14 6,14c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4c0,-0.59 -0.13,-1.14 -0.36,-1.64L12,14l7,7h3v-1L9.64,7.64zM6,8c-1.1,0 -2,-0.89 -2,-2s0.9,-2 2,-2 2,0.89 2,2 -0.9,2 -2,2zM6,20c-1.1,0 -2,-0.89 -2,-2s0.9,-2 2,-2 2,0.89 2,2 -0.9,2 -2,2zM12,12.5c-0.28,0 -0.5,-0.22 -0.5,-0.5s0.22,-0.5 0.5,-0.5 0.5,0.22 0.5,0.5 -0.22,0.5 -0.5,0.5zM19,3l-6,6 2,2 7,-7L22,3z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml b/android/source/res/drawable/ic_content_paste_black_24dp.xml
new file mode 100644
index 000000000..a902d9a85
--- /dev/null
+++ b/android/source/res/drawable/ic_content_paste_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_done_all_white_12dp.xml b/android/source/res/drawable/ic_done_all_white_12dp.xml
new file mode 100644
index 000000000..8c17c93e4
--- /dev/null
+++ b/android/source/res/drawable/ic_done_all_white_12dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:strokeColor="#231F20"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+</vector>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_done_white_12dp.xml b/android/source/res/drawable/ic_done_white_12dp.xml
new file mode 100644
index 000000000..ed73ad37f
--- /dev/null
+++ b/android/source/res/drawable/ic_done_white_12dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:strokeColor="#231F20"
+        android:fillColor="#FFFF"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_filter_list_black_24dp.xml b/android/source/res/drawable/ic_filter_list_black_24dp.xml
new file mode 100644
index 000000000..b99b672f4
--- /dev/null
+++ b/android/source/res/drawable/ic_filter_list_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_folder_black_24dp.xml b/android/source/res/drawable/ic_folder_black_24dp.xml
new file mode 100644
index 000000000..1a9a16fb1
--- /dev/null
+++ b/android/source/res/drawable/ic_folder_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_format_align_center.xml b/android/source/res/drawable/ic_format_align_center.xml
new file mode 100644
index 000000000..6165f386f
--- /dev/null
+++ b/android/source/res/drawable/ic_format_align_center.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_align_center_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_format_align_justify.xml b/android/source/res/drawable/ic_format_align_justify.xml
new file mode 100644
index 000000000..d39454084
--- /dev/null
+++ b/android/source/res/drawable/ic_format_align_justify.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_align_justify_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_format_align_left.xml b/android/source/res/drawable/ic_format_align_left.xml
new file mode 100644
index 000000000..53bf814f4
--- /dev/null
+++ b/android/source/res/drawable/ic_format_align_left.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_align_left_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_format_align_right.xml b/android/source/res/drawable/ic_format_align_right.xml
new file mode 100644
index 000000000..792112e6f
--- /dev/null
+++ b/android/source/res/drawable/ic_format_align_right.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_align_right_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_format_bullets.xml b/android/source/res/drawable/ic_format_bullets.xml
new file mode 100644
index 000000000..32539b715
--- /dev/null
+++ b/android/source/res/drawable/ic_format_bullets.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_list_bulleted_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_format_clear_black_24dp.xml b/android/source/res/drawable/ic_format_clear_black_24dp.xml
new file mode 100644
index 000000000..4c903c716
--- /dev/null
+++ b/android/source/res/drawable/ic_format_clear_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3.27,5L2,6.27l6.97,6.97L6.5,19h3l1.57,-3.66L16.73,21 18,19.73 3.55,5.27 3.27,5zM6,5v0.18L8.82,8h2.4l-0.72,1.68 2.1,2.1L14.21,8H20V5H6z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_format_numbering.xml b/android/source/res/drawable/ic_format_numbering.xml
new file mode 100644
index 000000000..b276cd3bb
--- /dev/null
+++ b/android/source/res/drawable/ic_format_numbering.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_format_list_numbered_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_grid_off_black_24dp.xml b/android/source/res/drawable/ic_grid_off_black_24dp.xml
new file mode 100644
index 000000000..7cf3c950c
--- /dev/null
+++ b/android/source/res/drawable/ic_grid_off_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8,4v1.45l2,2L10,4h4v4h-3.45l2,2L14,10v1.45l2,2L16,10h4v4h-3.45l2,2L20,16v1.45l2,2L22,4c0,-1.1 -0.9,-2 -2,-2L4.55,2l2,2L8,4zM16,4h4v4h-4L16,4zM1.27,1.27L0,2.55l2,2L2,20c0,1.1 0.9,2 2,2h15.46l2,2 1.27,-1.27L1.27,1.27zM10,12.55L11.45,14L10,14v-1.45zM4,6.55L5.45,8L4,8L4,6.55zM8,20L4,20v-4h4v4zM8,14L4,14v-4h3.45l0.55,0.55L8,14zM14,20h-4v-4h3.45l0.55,0.54L14,20zM16,20v-1.46L17.46,20L16,20z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_grid_on_black_24dp.xml b/android/source/res/drawable/ic_grid_on_black_24dp.xml
new file mode 100644
index 000000000..b2ff9e5be
--- /dev/null
+++ b/android/source/res/drawable/ic_grid_on_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM8,20L4,20v-4h4v4zM8,14L4,14v-4h4v4zM8,8L4,8L4,4h4v4zM14,20h-4v-4h4v4zM14,14h-4v-4h4v4zM14,8h-4L10,4h4v4zM20,20h-4v-4h4v4zM20,14h-4v-4h4v4zM20,8h-4L16,4h4v4z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_grow.xml b/android/source/res/drawable/ic_grow.xml
new file mode 100644
index 000000000..fd169434d
--- /dev/null
+++ b/android/source/res/drawable/ic_grow.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="m17,9.219 l0,-4.313 2.281,2.313 0.719,-0.719 -3.281,-3.281 -0.219,-0.219 -0.219,0.219 -3.281,3.281 0.719,0.719 2.281,-2.313 0,4.313 1,0z"
+        android:fillAlpha="1"
+        android:strokeColor="#00000000"
+        android:fillColor="#1d99f3"/>
+    <path
+        android:pathData="m8.911,5 l-3.315,9.594 -0.123,0.406 -1.473,4 1.657,0 1.627,-4.438 5.432,0 1.627,4.438 1.657,0 -1.473,-4 -0.123,-0.406 -3.315,-9.594 -0.215,0 -1.749,0 -0.215,0zM10.015,6.938 L12.194,13.281 7.806,13.281 10.015,6.938z"
+        android:fillAlpha="1"
+        android:strokeColor="#00000000"
+        android:fillColor="#4d4d4d"/>
+</vector>
diff --git a/android/source/res/drawable/ic_insert_drive_file_black_24dp.xml b/android/source/res/drawable/ic_insert_drive_file_black_24dp.xml
new file mode 100644
index 000000000..aaeb289d7
--- /dev/null
+++ b/android/source/res/drawable/ic_insert_drive_file_black_24dp.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+    <path android:fillColor="#FF000000" android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml b/android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml
new file mode 100644
index 000000000..827cde005
--- /dev/null
+++ b/android/source/res/drawable/ic_keyboard_backspace_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,11H6.83l3.58,-3.59L9,6l-6,6 6,6 1.41,-1.41L6.83,13H21z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_line.xml b/android/source/res/drawable/ic_line.xml
new file mode 100644
index 000000000..639ba2dbf
--- /dev/null
+++ b/android/source/res/drawable/ic_line.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M4,11h16v2h-16z"
+        android:fillAlpha="1"
+        android:strokeColor="#00000000"
+        android:fillColor="#4d4d4d"
+        android:strokeWidth="2"/>
+</vector>
diff --git a/android/source/res/drawable/ic_menu_back.png b/android/source/res/drawable/ic_menu_back.png
new file mode 100644
index 000000000..d3191caff
Binary files /dev/null and b/android/source/res/drawable/ic_menu_back.png differ
diff --git a/android/source/res/drawable/ic_rect.xml b/android/source/res/drawable/ic_rect.xml
new file mode 100644
index 000000000..241759ff0
--- /dev/null
+++ b/android/source/res/drawable/ic_rect.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M4,6h16v12h-16z"
+        android:fillAlpha="0.99"
+        android:strokeColor="#00000000"
+        android:fillColor="#4d4d4d"
+        android:strokeWidth="4"
+        android:strokeAlpha="0.99"/>
+</vector>
diff --git a/android/source/res/drawable/ic_redo.xml b/android/source/res/drawable/ic_redo.xml
new file mode 100644
index 000000000..fefaa1d35
--- /dev/null
+++ b/android/source/res/drawable/ic_redo.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_redo_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_sd_card_black_24dp.xml b/android/source/res/drawable/ic_sd_card_black_24dp.xml
new file mode 100644
index 000000000..f9ad72d48
--- /dev/null
+++ b/android/source/res/drawable/ic_sd_card_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_search.xml b/android/source/res/drawable/ic_search.xml
new file mode 100644
index 000000000..3d86c7bfd
--- /dev/null
+++ b/android/source/res/drawable/ic_search.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_search_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_search_direction_down.xml b/android/source/res/drawable/ic_search_direction_down.xml
new file mode 100644
index 000000000..7184da213
--- /dev/null
+++ b/android/source/res/drawable/ic_search_direction_down.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/ic_search_direction_down_black_24dp"
+        android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_search_direction_up.xml b/android/source/res/drawable/ic_search_direction_up.xml
new file mode 100644
index 000000000..3faa7ae96
--- /dev/null
+++ b/android/source/res/drawable/ic_search_direction_up.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/ic_search_direction_up_black_24dp"
+        android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_settings_black_24dp.xml b/android/source/res/drawable/ic_settings_black_24dp.xml
new file mode 100644
index 000000000..ace746c40
--- /dev/null
+++ b/android/source/res/drawable/ic_settings_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_shrink.xml b/android/source/res/drawable/ic_shrink.xml
new file mode 100644
index 000000000..db0348437
--- /dev/null
+++ b/android/source/res/drawable/ic_shrink.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="m16,14.781 l0,4.313 -2.281,-2.313 -0.719,0.719 3.281,3.281 0.219,0.219 0.219,-0.219 3.281,-3.281 -0.719,-0.719 -2.281,2.313 0,-4.313 -1,0z"
+        android:fillAlpha="1"
+        android:strokeColor="#00000000"
+        android:fillColor="#1d99f3"/>
+    <path
+        android:pathData="m8.91,5 l-3.314,9.594 -0.123,0.406 -1.473,4 1.658,0 1.625,-4.438c-0.004,-0.001 7.111,0.004 7.111,0.004l-3.305,-9.566 -0.215,0 -1.75,0zM10.016,6.938 L12.195,13.281 7.805,13.281z"
+        android:fillAlpha="1"
+        android:strokeColor="#00000000"
+        android:fillColor="#4d4d4d"/>
+</vector>
diff --git a/android/source/res/drawable/ic_sort_black_24dp.xml b/android/source/res/drawable/ic_sort_black_24dp.xml
new file mode 100644
index 000000000..d582deea6
--- /dev/null
+++ b/android/source/res/drawable/ic_sort_black_24dp.xml
@@ -0,0 +1,13 @@
+<!--
+ This file is part of the LibreOffice project.
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_storage_black_24dp.xml b/android/source/res/drawable/ic_storage_black_24dp.xml
new file mode 100644
index 000000000..53c595cd7
--- /dev/null
+++ b/android/source/res/drawable/ic_storage_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/>
+</vector>
diff --git a/android/source/res/drawable/ic_subscript.xml b/android/source/res/drawable/ic_subscript.xml
new file mode 100644
index 000000000..7a379cf50
--- /dev/null
+++ b/android/source/res/drawable/ic_subscript.xml
@@ -0,0 +1,10 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#1d99f3"
+        android:pathData="m16,15 l0,2 0,1 0,2 0,1 1,0 2,0c1.108,0 2,-0.892 2,-2 0,-0.811 -0.481,-1.502 -1.172,-1.816 0.106,-0.206 0.172,-0.435 0.172,-0.684 0,-0.831 -0.669,-1.5 -1.5,-1.5l-1.5,0 -1,0zM17,16 L18.5,16c0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5l-1.5,0 0,-1zM17,18 L18.5,18 19,18c0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1l-2,0 0,-2z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#4d4d4d"
+        android:pathData="m10.91,5 l-3.314,9.594 -0.123,0.406 -1.473,4 1.658,0 1.625,-4.438c-0.004,-0.001 7.111,0.004 7.111,0.004l-3.305,-9.566 -0.215,0 -1.75,0zM12.016,6.938 L14.195,13.281 9.805,13.281z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/android/source/res/drawable/ic_superscript.xml b/android/source/res/drawable/ic_superscript.xml
new file mode 100644
index 000000000..aa18a305d
--- /dev/null
+++ b/android/source/res/drawable/ic_superscript.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="m16,3 l0,2 0,1 0,2 0,1 1,0 2,0c1.108,0 2,-0.892 2,-2 0,-0.811 -0.481,-1.502 -1.172,-1.816 0.106,-0.206 0.172,-0.435 0.172,-0.684 0,-0.831 -0.669,-1.5 -1.5,-1.5l-1.5,0 -1,0zM17,4 L18.5,4c0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5l-1.5,0 0,-1zM17,6 L18.5,6 19,6c0.554,0 1,0.446 1,1 0,0.554 -0.446,1 -1,1l-2,0 0,-2z"
+        android:strokeLineCap="butt"
+        android:fillAlpha="1"
+        android:strokeColor="#00000000"
+        android:fillColor="#1d99f3"
+        android:strokeWidth="1"
+        android:strokeLineJoin="miter"
+        android:strokeAlpha="1"/>
+    <path
+        android:pathData="m10.911,5 l-3.315,9.594 -0.123,0.406 -1.473,4 1.657,0 1.627,-4.438 5.432,0 1.627,4.438 1.657,0 -1.473,-4 -0.123,-0.406 -3.315,-9.594 -0.215,0 -1.749,0 -0.215,0zM12.015,6.938 L14.194,13.281 9.806,13.281 12.015,6.938z"
+        android:fillAlpha="1"
+        android:strokeColor="#00000000"
+        android:fillColor="#4d4d4d"/>
+</vector>
diff --git a/android/source/res/drawable/ic_undo.xml b/android/source/res/drawable/ic_undo.xml
new file mode 100644
index 000000000..f792e66f3
--- /dev/null
+++ b/android/source/res/drawable/ic_undo.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_undo_black_24dp"
+    android:tint="@color/toolbar_foreground"/>
\ No newline at end of file
diff --git a/android/source/res/drawable/ic_usb_black_24dp.xml b/android/source/res/drawable/ic_usb_black_24dp.xml
new file mode 100644
index 000000000..d9b39bac1
--- /dev/null
+++ b/android/source/res/drawable/ic_usb_black_24dp.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+    <path android:fillColor="#FF000000" android:pathData="M15,7v4h1v2h-3V5h2l-3,-4 -3,4h2v8H8v-2.07c0.7,-0.37 1.2,-1.08 1.2,-1.93 0,-1.21 -0.99,-2.2 -2.2,-2.2 -1.21,0 -2.2,0.99 -2.2,2.2 0,0.85 0.5,1.56 1.2,1.93V13c0,1.11 0.89,2 2,2h3v3.05c-0.71,0.37 -1.2,1.1 -1.2,1.95 0,1.22 0.99,2.2 2.2,2.2 1.21,0 2.2,-0.98 2.2,-2.2 0,-0.85 -0.49,-1.58 -1.2,-1.95V15h3c1.11,0 2,-0.89 2,-2v-2h1V7h-4z"/>
+</vector>
diff --git a/android/source/res/drawable/impress.png b/android/source/res/drawable/impress.png
new file mode 100644
index 000000000..5909f05bf
Binary files /dev/null and b/android/source/res/drawable/impress.png differ
diff --git a/android/source/res/drawable/label_background.xml b/android/source/res/drawable/label_background.xml
new file mode 100644
index 000000000..1e0978575
--- /dev/null
+++ b/android/source/res/drawable/label_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/background_normal" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/android/source/res/drawable/writer.png b/android/source/res/drawable/writer.png
new file mode 100644
index 000000000..8a4e21e47
Binary files /dev/null and b/android/source/res/drawable/writer.png differ
diff --git a/android/source/res/layout/about.xml b/android/source/res/layout/about.xml
new file mode 100644
index 000000000..8968c00d2
--- /dev/null
+++ b/android/source/res/layout/about.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:padding="20dip">
+
+    <TextView
+        android:id="@+id/about_version"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textIsSelectable="true"
+        android:text="@string/app_version"
+        android:textSize="18sp"/>
+
+    <TextView
+        android:id="@+id/about_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/app_description"
+        android:textSize="18sp"/>
+
+    <TextView
+        android:id="@+id/about_credits"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autoLink="web"
+        android:paddingBottom="20dip"
+        android:paddingTop="20dip"
+        android:text="@string/app_credits"
+        android:textSize="18sp"/>
+
+    <TextView
+        android:id="@+id/about_vendor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textIsSelectable="true"
+        android:text="@string/app_vendor"
+        android:textSize="18sp"/>
+</LinearLayout>
+</ScrollView>
diff --git a/android/source/res/layout/activity_directory_browser.xml b/android/source/res/layout/activity_directory_browser.xml
new file mode 100644
index 000000000..b03c6bbb1
--- /dev/null
+++ b/android/source/res/layout/activity_directory_browser.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+
+</FrameLayout>
\ No newline at end of file
diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml
new file mode 100644
index 000000000..8e17a3e16
--- /dev/null
+++ b/android/source/res/layout/activity_document_browser.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <!-- The toolbar -->
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:elevation="3dp"
+        android:background="@color/toolbar_background"
+        app:theme="@style/LibreOfficeTheme.Toolbar"
+        tools:theme="@style/LibreOfficeTheme.Toolbar"
+        app:popupTheme="@style/LibreOfficeTheme"
+        tools:layout_constraintTop_creator="1"
+        tools:layout_constraintRight_creator="1"
+        app:layout_constraintRight_toRightOf="parent"
+        tools:layout_constraintLeft_creator="1"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </android.support.v7.widget.Toolbar>
+
+
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/drawer_layout"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        tools:layout_constraintTop_creator="1"
+        tools:layout_constraintRight_creator="1"
+        tools:layout_constraintBottom_creator="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        tools:layout_constraintLeft_creator="1"
+        app:layout_constraintLeft_toLeftOf="parent">
+
+        <!-- The content -->
+        <android.support.v4.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:divider="@color/doorhanger_divider_light"
+                android:showDividers="middle">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:id="@+id/header_recents"
+                    android:text="@string/title_recents"
+                    android:gravity="center_vertical"
+                    android:textSize="14sp"
+                    android:padding="16dp"
+                    android:textStyle="bold" />
+
+                <!--Recent files-->
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/list_recent"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:id="@+id/header_browser"
+                    android:text="@string/title_browser"
+                    android:gravity="center_vertical"
+                    android:textSize="14sp"
+                    android:padding="16dp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="14sp"
+                    android:padding="7dp"
+                    android:id="@+id/text_directory_path"
+                    android:background="@color/background_normal"
+                    />
+
+
+                <!--Document browser-->
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/file_recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/background_normal"
+                    android:orientation="vertical" />
+
+            </LinearLayout>
+
+        </android.support.v4.widget.NestedScrollView>
+
+        <!-- The navigation drawer -->
+        <android.support.design.widget.NavigationView
+            android:id="@+id/navigation_drawer"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:background="@color/background_normal"
+            app:menu="@menu/navigation_menu"
+            android:theme="@style/LibreOfficeTheme.NavigationView" />
+
+    </android.support.v4.widget.DrawerLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/editFAB"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:visibility="invisible"
+        app:backgroundTint="@color/background_normal"
+        app:fabSize="normal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:srcCompat="@drawable/ic_add_black_24dp"
+        app:useCompatPadding="true" />
+
+    <LinearLayout
+        android:id="@+id/writerLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toTopOf="@id/editFAB"
+        app:layout_constraintRight_toRightOf="@id/editFAB"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/newWriterTextView"
+            style="@style/NewDocumentTextView"
+            android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
+            android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
+            android:text="@string/new_textdocument" />
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/newWriterFAB"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
+            android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
+            android:clickable="true"
+            app:backgroundTint="@color/background_normal"
+            app:fabSize="mini"
+            app:srcCompat="@drawable/writer"
+            app:useCompatPadding="true" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/impressLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toTopOf="@+id/writerLayout"
+        app:layout_constraintRight_toRightOf="@id/editFAB"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/newImpressTextView"
+            style="@style/NewDocumentTextView"
+            android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
+            android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
+            android:text="@string/new_presentation" />
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/newImpressFAB"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
+            android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
+            android:clickable="true"
+            app:backgroundTint="@color/background_normal"
+            app:fabSize="mini"
+            app:srcCompat="@drawable/impress"
+            app:useCompatPadding="true" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/calcLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="invisible"
+        tools:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@+id/impressLayout"
+        app:layout_constraintRight_toRightOf="@id/editFAB">
+
+        <TextView
+            android:id="@+id/newCalcTextView"
+            style="@style/NewDocumentTextView"
+            android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
+            android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
+            android:text="@string/new_spreadsheet" />
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/newCalcFAB"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
+            android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
+            android:clickable="true"
+            app:backgroundTint="@color/background_normal"
+            app:fabSize="mini"
+            app:srcCompat="@drawable/calc"
+            app:useCompatPadding="true" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/drawLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="invisible"
+        tools:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@+id/calcLayout"
+        app:layout_constraintRight_toRightOf="@id/editFAB">
+
+        <TextView
+            android:id="@+id/newDrawTextView"
+            style="@style/NewDocumentTextView"
+            android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
+            android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
+            android:text="@string/new_drawing" />
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/newDrawFAB"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
+            android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
+            android:clickable="true"
+            app:backgroundTint="@color/background_normal"
+            app:fabSize="mini"
+            app:srcCompat="@drawable/draw"
+            app:useCompatPadding="true" />
+
+    </LinearLayout>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml
new file mode 100644
index 000000000..c2528023d
--- /dev/null
+++ b/android/source/res/layout/activity_main.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#fff"
+    tools:context=".LibreOfficeMainActivity">
+
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/coordinator_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <android.support.design.widget.AppBarLayout
+                android:id="@+id/appBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <android.support.v7.widget.Toolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:elevation="3dp"
+                    android:background="@color/toolbar_background"
+                    app:theme="@style/LibreOfficeTheme.Toolbar"
+                    tools:theme="@style/LibreOfficeTheme.Toolbar"
+                    app:popupTheme="@style/LibreOfficeTheme" />
+
+            </android.support.design.widget.AppBarLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText
+                    android:id="@+id/calc_address"
+                    android:layout_width="@dimen/calc_address_bar_width"
+                    android:layout_height="@dimen/calc_toolbar_height"
+                    android:layout_weight="0"
+                    android:inputType="textNoSuggestions"
+                    android:imeOptions="actionDone|actionGo"
+                    android:visibility="gone"/>
+
+                <EditText
+                    android:id="@+id/calc_formula"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/calc_toolbar_height"
+                    android:layout_weight="1"
+                    android:inputType="text"
+                    android:imeOptions="actionDone|actionGo"
+                    android:visibility="gone"/>
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <View
+                    android:id="@+id/calc_header_top_left"
+                    android:layout_width="@dimen/calc_header_width"
+                    android:layout_height="@dimen/calc_header_height"
+                    android:visibility="gone"/>
+
+                <org.libreoffice.overlay.CalcHeadersView
+                    android:id="@+id/calc_header_column"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/calc_header_height"
+                    android:layout_toRightOf="@+id/calc_header_top_left"
+                    android:layout_toEndOf="@+id/calc_header_top_left"
+                    android:visibility="gone"/>
+
+                <org.libreoffice.overlay.CalcHeadersView
+                    android:id="@+id/calc_header_row"
+                    android:layout_width="@dimen/calc_header_width"
+                    android:layout_height="match_parent"
+                    android:layout_below="@+id/calc_header_top_left"
+                    android:visibility="gone"/>
+
+                <RelativeLayout
+                    android:id="@+id/gecko_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:layout_toRightOf="@+id/calc_header_row"
+                    android:layout_toEndOf="@+id/calc_header_row"
+                    android:layout_below="@+id/calc_header_column">
+
+                    <org.mozilla.gecko.gfx.LayerView
+                        android:id="@+id/layer_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"/>
+
+                    <org.libreoffice.overlay.DocumentOverlayView
+                        android:id="@+id/text_cursor_view"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"/>
+
+                </RelativeLayout>
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+        <include layout="@layout/toolbar_bottom"/>
+        <include android:id="@+id/toolbar_back_color_picker" layout="@layout/toolbar_color_picker"/>
+        <include android:id="@+id/toolbar_color_picker" layout="@layout/toolbar_color_picker"/>
+
+        <RelativeLayout
+            android:id="@+id/loadingPanel"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#9333"
+            android:gravity="center">
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"/>
+
+        </RelativeLayout>
+
+        <!--What's the use of this view? Can it be removed?-->
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </android.support.design.widget.CoordinatorLayout>
+
+    <ListView
+        android:id="@+id/left_drawer"
+        android:layout_width="240dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:background="#9FFF"
+        android:choiceMode="singleChoice"/>
+
+</android.support.v4.widget.DrawerLayout>
diff --git a/android/source/res/layout/calc_header_popup.xml b/android/source/res/layout/calc_header_popup.xml
new file mode 100644
index 000000000..8e563af27
--- /dev/null
+++ b/android/source/res/layout/calc_header_popup.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/doorhanger_background_dark">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/calc_header_popup_insert"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:attr/buttonBarButtonStyle"
+                android:text="@string/calc_insert_before"/>
+
+            <Button
+                android:id="@+id/calc_header_popup_delete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:attr/buttonBarButtonStyle"
+                android:text="@string/calc_delete"/>
+
+            <Button
+                android:id="@+id/calc_header_popup_hide"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:attr/buttonBarButtonStyle"
+                android:text="@string/calc_hide"/>
+
+            <Button
+                android:id="@+id/calc_header_popup_show"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:attr/buttonBarButtonStyle"
+                android:text="@string/calc_show"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/calc_header_popup_optimal_length"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:attr/buttonBarButtonStyle"
+                android:text="@string/calc_optimal_length"/>
+
+            <Button
+                android:id="@+id/calc_header_popup_adjust_length"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="?android:attr/buttonBarButtonStyle"
+                android:text="@string/calc_adjust_length"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/calc_header_popup_optimal_length_dialog"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <EditText
+                android:id="@+id/calc_header_popup_optimal_length_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:inputType="numberDecimal"
+                android:hint="@string/calc_optimal_length_default_text"/>
+
+            <Button
+                android:id="@+id/calc_header_popup_optimal_length_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text = "@string/calc_optimal_length_confirm"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/android/source/res/layout/colorbox.xml b/android/source/res/layout/colorbox.xml
new file mode 100644
index 000000000..2c3366e66
--- /dev/null
+++ b/android/source/res/layout/colorbox.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageButton
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="35dp"
+        android:id="@+id/fontColorBox"
+        android:clickable="true"
+        android:scaleType="fitCenter"
+        />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/source/res/layout/document_part_list_layout.xml b/android/source/res/layout/document_part_list_layout.xml
new file mode 100644
index 000000000..a20aeaff5
--- /dev/null
+++ b/android/source/res/layout/document_part_list_layout.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal">
+
+    <ImageView
+        android:id="@+id/image"
+        tools:src="@drawable/dummy_page"
+        android:layout_width="128dp"
+        android:layout_height="128dp"/>
+
+    <TextView
+        android:id="@+id/text"
+        tools:text="slide or page#"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/android/source/res/layout/document_viewer.xml b/android/source/res/layout/document_viewer.xml
new file mode 100644
index 000000000..b4f450164
--- /dev/null
+++ b/android/source/res/layout/document_viewer.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:id="@+id/document_viewer_root">
+    <ViewFlipper
+        android:id="@+id/page_flipper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+    </ViewFlipper>
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/page_flipper"
+        android:scrollbarAlwaysDrawHorizontalTrack="true"
+        android:background="#aa000000">
+        <LinearLayout
+            android:id="@+id/navigator"
+            android:layout_width="wrap_content"
+            android:layout_height="120dp"
+            android:layout_margin="15dp"
+            android:orientation="horizontal">
+        </LinearLayout>
+    </HorizontalScrollView>
+
+</RelativeLayout>
diff --git a/android/source/res/layout/file_explorer_grid_item.xml b/android/source/res/layout/file_explorer_grid_item.xml
new file mode 100644
index 000000000..e64fdc23a
--- /dev/null
+++ b/android/source/res/layout/file_explorer_grid_item.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:id="@+id/file_item_icon"
+        tools:src="@drawable/ic_folder_black_24dp"
+        tools:tint="@color/text_color_secondary"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:scaleType="fitStart"
+        android:layout_gravity="center"
+        android:contentDescription="@string/file_icon_desc" >
+    </ImageView>
+
+    <TextView
+        android:id="@+id/file_item_name"
+        tools:text="file or dirname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
+        android:layout_gravity="center"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        android:textColor="@android:color/secondary_text_light"
+        android:maxLines="2">
+    </TextView>
+
+</LinearLayout>
diff --git a/android/source/res/layout/file_grid.xml b/android/source/res/layout/file_grid.xml
new file mode 100644
index 000000000..1885bd34e
--- /dev/null
+++ b/android/source/res/layout/file_grid.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <GridView
+        android:id="@+id/file_explorer_grid_view"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:columnWidth="120dp"
+        android:numColumns="auto_fit"
+        android:verticalSpacing="10dp"
+        android:horizontalSpacing="10dp"
+        android:stretchMode="columnWidth"
+        android:gravity="center">
+    </GridView>
+
+</LinearLayout>
diff --git a/android/source/res/layout/file_list.xml b/android/source/res/layout/file_list.xml
new file mode 100644
index 000000000..48dfb1e31
--- /dev/null
+++ b/android/source/res/layout/file_list.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <ListView
+        android:id="@+id/file_explorer_list_view"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+    </ListView>
+
+</LinearLayout>
diff --git a/android/source/res/layout/file_list_item.xml b/android/source/res/layout/file_list_item.xml
new file mode 100644
index 000000000..518885d4b
--- /dev/null
+++ b/android/source/res/layout/file_list_item.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:orientation="horizontal"
+    android:layout_marginStart="@dimen/list_item_margin"
+    android:layout_marginLeft="@dimen/list_item_margin"
+    android:layout_marginEnd="@dimen/list_item_margin"
+    android:layout_marginRight="@dimen/list_item_margin">
+    <ImageView
+        android:id="@+id/file_item_icon"
+        tools:src="@drawable/ic_folder_black_24dp"
+        tools:tint="@color/text_color_secondary"
+        android:layout_height="match_parent"
+        android:layout_width="@dimen/file_icon_width"
+        android:layout_marginEnd="@dimen/file_icon_margin_end"
+        android:layout_marginRight="@dimen/file_icon_margin_end"
+        android:layout_gravity="center"
+        android:contentDescription="@string/file_icon_desc" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:orientation="horizontal">
+        <TextView
+            android:id="@+id/file_item_name"
+            tools:text="file or dirname"
+            style="@style/ListItemText"
+            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:ellipsize="end"
+            android:maxLines="1"/>
+        <TextView
+            android:id="@+id/file_item_size"
+            tools:text="filesize"
+            style="@style/ListItemText"
+            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="1" />
+        <TextView
+            android:id="@+id/file_item_date"
+            tools:text="date/time"
+            style="@style/ListItemText"
+            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_weight="2"
+            android:ellipsize="end"
+            android:gravity="end"
+            android:maxLines="1"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/android/source/res/layout/fragment_directory_browser.xml b/android/source/res/layout/fragment_directory_browser.xml
new file mode 100644
index 000000000..37a61fa35
--- /dev/null
+++ b/android/source/res/layout/fragment_directory_browser.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF">
+
+    <LinearLayout
+        android:id="@+id/browser_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/up_image"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:src="@drawable/ic_menu_back"
+            android:scaleType="fitCenter"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/up_description"/>
+
+        <EditText
+            android:id="@+id/directory_header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:maxLines="1"
+            android:scrollHorizontally="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:inputType="text"/>
+
+        <Button
+            android:id="@+id/directory_search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="@string/search_label"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/browser_footer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true">
+
+        <Button
+            android:id="@+id/cancel_button"
+            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:text="@string/cancel_label"/>
+
+        <Button
+            android:id="@+id/confirm_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/confirm_label"/>
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/directory_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/browser_header"
+        android:layout_above="@id/browser_footer">
+    </ListView>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/source/res/layout/item_recent_files.xml b/android/source/res/layout/item_recent_files.xml
new file mode 100644
index 000000000..b374ba56f
--- /dev/null
+++ b/android/source/res/layout/item_recent_files.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:orientation="horizontal"
+    android:background="?android:attr/selectableItemBackground"
+    android:layout_marginStart="@dimen/list_item_margin"
+    android:layout_marginLeft="@dimen/list_item_margin"
+    android:layout_marginEnd="@dimen/list_item_margin"
+    android:layout_marginRight="@dimen/list_item_margin"
+    tools:ignore="UseCompoundDrawables">
+    <!--using compound drawables is ignored because more control over the drawable size is needed-->
+
+    <ImageView
+        android:layout_width="32dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="@dimen/file_icon_margin_end"
+        android:layout_marginRight="@dimen/file_icon_margin_end"
+        android:adjustViewBounds="true"
+        android:id="@+id/imageView"
+        android:contentDescription="@string/file_icon_desc"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:id="@+id/textView"
+        style="@style/ListItemText"
+        android:maxLines="1"
+        android:ellipsize="end"/>
+</LinearLayout>
diff --git a/android/source/res/layout/main.xml b/android/source/res/layout/main.xml
new file mode 100644
index 000000000..0264e28f7
--- /dev/null
+++ b/android/source/res/layout/main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#aaa"
+    android:orientation="vertical"
+    >
+
+    <org.libreoffice.ui.PageView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/source/res/layout/number_picker.xml b/android/source/res/layout/number_picker.xml
new file mode 100644
index 000000000..51463926c
--- /dev/null
+++ b/android/source/res/layout/number_picker.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="15dp"
+    android:id="@+id/numberpickerLayout">
+
+    <TextView
+        android:id="@+id/textView11"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:text="Rows:"
+        android:gravity="center"
+        android:textSize="18sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/number_picker_rows_positive"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/image_button_background"
+        android:clickable="true"
+        android:gravity="center"
+        android:text="+"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout"
+        app:layout_constraintTop_toTopOf="@+id/numberpickerLayout" />
+
+    <TextView
+        android:id="@+id/number_picker_row_count"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="3"
+        android:gravity="center"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/number_picker_rows_positive"
+        app:layout_constraintStart_toEndOf="@+id/number_picker_rows_negative"
+        app:layout_constraintTop_toTopOf="@+id/numberpickerLayout" />
+
+    <TextView
+        android:id="@+id/number_picker_rows_negative"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="-"
+        android:gravity="center"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:clickable="true"
+        android:background="@drawable/image_button_background"
+        app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout"
+        app:layout_constraintStart_toStartOf="@+id/numberpickerLayout"
+        app:layout_constraintTop_toTopOf="@+id/numberpickerLayout" />
+
+    <TextView
+        android:id="@+id/textView12"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="24dp"
+        android:text="Columns:"
+        android:gravity="center"
+        android:textSize="18sp"
+        app:layout_constraintStart_toStartOf="@+id/numberpickerLayout"
+        app:layout_constraintTop_toBottomOf="@+id/textView11" />
+
+    <TextView
+        android:id="@+id/number_picker_cols_negative"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="24dp"
+        android:text="-"
+        android:gravity="center"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:background="@drawable/image_button_background"
+        android:clickable="true"
+        app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout"
+        app:layout_constraintStart_toStartOf="@+id/numberpickerLayout"
+        app:layout_constraintTop_toBottomOf="@+id/number_picker_rows_negative" />
+
+    <TextView
+        android:id="@+id/number_picker_col_count"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:text="3"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/number_picker_cols_positive"
+        app:layout_constraintStart_toEndOf="@+id/number_picker_cols_negative"
+        app:layout_constraintTop_toBottomOf="@+id/number_picker_row_count" />
+
+    <TextView
+        android:id="@+id/number_picker_cols_positive"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="24dp"
+        android:text="+"
+        android:gravity="center"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:clickable="true"
+        android:background="@drawable/image_button_background"
+        app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout"
+        app:layout_constraintTop_toBottomOf="@+id/number_picker_rows_positive" />
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/android/source/res/layout/password_dialog.xml b/android/source/res/layout/password_dialog.xml
new file mode 100644
index 000000000..adc4f4249
--- /dev/null
+++ b/android/source/res/layout/password_dialog.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <EditText
+        android:id="@+id/password"
+        android:inputType="textPassword"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginBottom="16dp"
+        android:hint="@string/password"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/source/res/layout/presentation_mode.xml b/android/source/res/layout/presentation_mode.xml
new file mode 100644
index 000000000..ec1845ab6
--- /dev/null
+++ b/android/source/res/layout/presentation_mode.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+
+    <WebView
+        android:id="@+id/presentation_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
+        android:id="@+id/presentation_gesture_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true">
+
+        <ImageButton
+            android:id="@+id/slide_show_nav_prev"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:src="@drawable/ic_search_direction_up" />
+
+        <ImageButton
+            android:id="@+id/slide_show_nav_next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:src="@drawable/ic_search_direction_down" />
+
+        <Button
+            android:id="@+id/slide_show_nav_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:text="@string/slideshow_action_back" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/source/res/layout/text_selection_handles.xml b/android/source/res/layout/text_selection_handles.xml
new file mode 100644
index 000000000..0be954d0d
--- /dev/null
+++ b/android/source/res/layout/text_selection_handles.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
+
+    <org.libreoffice.overlay.DocumentOverlayView
+        android:id="@+id/text_cursor_view"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"/>
+
+</merge>
diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml
new file mode 100644
index 000000000..f4b3f3c5f
--- /dev/null
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -0,0 +1,552 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/toolbar_bottom"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    android:background="@color/toolbar_background"
+    android:elevation="3dp"
+    android:orientation="vertical"
+    app:popupTheme="@style/LibreOfficeTheme.Toolbar"
+    app:theme="@style/LibreOfficeTheme.Toolbar"
+    tools:showIn="@layout/activity_main"
+    app:layout_behavior="android.support.design.widget.BottomSheetBehavior"
+    app:behavior_hideable="true"
+    app:behavior_peekHeight="0dp">
+
+    <LinearLayout
+        android:id="@+id/formatting_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TabHost
+            android:id="@+id/toolbarTabHost"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <TabWidget
+                    android:id="@android:id/tabs"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1">
+
+                </TabWidget>
+
+                <FrameLayout
+                    android:id="@android:id/tabcontent"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <LinearLayout
+                        android:id="@+id/tab_character"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <ScrollView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical">
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="0.25"
+                                    android:orientation="horizontal">
+
+                                    <ImageButton
+                                        android:id="@+id/button_bold"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_bold" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_italic"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_italic" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_underlined"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_underlined" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_strikethrough"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_strikethrough" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_clearformatting"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        app:srcCompat="@drawable/ic_format_clear_black_24dp" />
+
+                                </LinearLayout>
+
+                                <Spinner
+                                    android:id="@+id/font_name_spinner"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:minHeight="50dip" />
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:orientation="horizontal">
+
+                                    <Spinner
+                                        android:id="@+id/font_size_spinner"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.60"
+                                        android:minHeight="50dip" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_font_shrink"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.10"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        app:srcCompat="@drawable/ic_shrink" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_font_grow"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.10"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        app:srcCompat="@drawable/ic_grow" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_subscript"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.10"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        app:srcCompat="@drawable/ic_subscript" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_superscript"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.10"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        app:srcCompat="@drawable/ic_superscript" />
+
+                                </LinearLayout>
+
+                            </LinearLayout>
+                        </ScrollView>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/tab_paragraph"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <ScrollView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical">
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:orientation="horizontal">
+
+                                    <ImageButton
+                                        android:id="@+id/button_align_left"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_align_left" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_align_center"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_align_center" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_align_right"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_align_right" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_align_justify"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_align_justify" />
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:orientation="horizontal">
+
+                                    <ImageButton
+                                        android:id="@+id/button_insertFormatListNumbering"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_numbering" />
+
+                                    <ImageButton
+                                        android:id="@+id/button_insertFormatListBullets"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="0.25"
+                                        android:background="@drawable/image_button_background"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:src="@drawable/ic_format_bullets" />
+                                </LinearLayout>
+
+                            </LinearLayout>
+                        </ScrollView>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/tab_insert"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <ScrollView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_weight="0.25"
+                                android:orientation="horizontal">
+
+                                <ImageButton
+                                    android:id="@+id/button_insert_line"
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="0.25"
+                                    android:background="@drawable/image_button_background"
+                                    android:paddingBottom="12dp"
+                                    android:paddingTop="12dp"
+                                    app:srcCompat="@drawable/ic_line" />
+
+                                <ImageButton
+                                    android:id="@+id/button_insert_rect"
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="0.25"
+                                    android:background="@drawable/image_button_background"
+                                    android:paddingBottom="12dp"
+                                    android:paddingTop="12dp"
+                                    app:srcCompat="@drawable/ic_rect" />
+
+                                <ImageButton
+                                    android:id="@+id/button_insert_picture"
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="0.25"
+                                    android:background="@drawable/image_button_background"
+                                    android:paddingBottom="12dp"
+                                    android:paddingTop="12dp"
+                                    app:srcCompat="@drawable/ic_folder_black_24dp" />
+
+                                <ImageButton
+                                    android:id="@+id/button_insert_table"
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="0.25"
+                                    android:background="@drawable/image_button_background"
+                                    android:paddingBottom="12dp"
+                                    android:paddingTop="12dp"
+                                    app:srcCompat="@drawable/ic_grid_on_black_24dp" />
+
+                                <ImageButton
+                                    android:id="@+id/button_delete_table"
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="0.25"
+                                    android:background="@drawable/image_button_background"
+                                    android:paddingBottom="12dp"
+                                    android:paddingTop="12dp"
+                                    app:srcCompat="@drawable/ic_grid_off_black_24dp" />
+                            </LinearLayout>
+                        </ScrollView>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/tab_style"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
+
+                        <ScrollView
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height">
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_weight="0.5"
+                                android:orientation="vertical">
+                                <RelativeLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:id="@+id/font_color_picker"
+                                    android:padding="10dp">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/font_color"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:textSize="14sp"
+                                        android:gravity="center_vertical"
+                                        android:textColor="@color/fontBlack"
+                                        android:layout_alignParentLeft="true"
+
+                                        />
+                                    <ImageButton
+                                        android:id="@+id/font_color_picker_button"
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:gravity="center_vertical"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:layout_alignParentRight="true"
+                                        />
+
+                                </RelativeLayout>
+
+                                <RelativeLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:id="@+id/font_back_color_picker"
+                                    android:padding="10dp">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/highlight_color"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:textSize="14sp"
+                                        android:gravity="center_vertical"
+                                        android:textColor="@color/fontBlack"
+                                        android:layout_alignParentLeft="true"
+
+                                        />
+                                    <ImageButton
+                                        android:id="@+id/font_back_color_picker_button"
+                                        android:layout_width="24dp"
+                                        android:layout_height="24dp"
+                                        android:gravity="center_vertical"
+                                        android:paddingBottom="12dp"
+                                        android:paddingTop="12dp"
+                                        android:layout_alignParentRight="true"
+                                        />
+
+                                </RelativeLayout>
+                            </LinearLayout>
+                        </ScrollView>
+
+                    </LinearLayout>
+                </FrameLayout>
+            </LinearLayout>
+        </TabHost>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/search_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/search_string"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="0.2"
+            android:imeOptions="actionSearch"
+            android:inputType="text" />
+
+        <ImageButton
+            android:id="@+id/button_search_down"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6"
+            android:background="@drawable/image_button_background"
+            android:padding="10dp"
+            android:src="@drawable/ic_search_direction_down" />
+
+        <ImageButton
+            android:id="@+id/button_search_up"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6"
+            android:background="@drawable/image_button_background"
+            android:padding="10dp"
+            android:src="@drawable/ic_search_direction_up" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/UNO_commands_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/UNO_commands_string"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:maxLines="1"
+                android:scrollHorizontally="true"
+                android:inputType="textNoSuggestions"
+                android:hint="@string/UNO_commands_string_hint" />
+
+            <ImageButton
+                android:id="@+id/button_send_UNO_commands"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/image_button_background"
+                android:padding="10dp"
+                app:srcCompat="@drawable/ic_check" />
+
+            <ImageButton
+                android:id="@+id/button_send_UNO_commands_show"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/image_button_background"
+                android:padding="10dp"
+                app:srcCompat="@drawable/ic_filter_list_black_24dp" />
+
+            <ImageButton
+                android:id="@+id/button_send_UNO_commands_clear"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/image_button_background"
+                android:padding="10dp"
+                app:srcCompat="@drawable/ic_undo" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/UNO_commands_string_parent_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:maxLines="1"
+                android:scrollHorizontally="true"
+                android:inputType="textNoSuggestions"
+                android:hint="@string/UNO_commands_string_parent_value_hint" />
+
+            <EditText
+                android:id="@+id/UNO_commands_string_type"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:maxLines="1"
+                android:scrollHorizontally="true"
+                android:inputType="textNoSuggestions"
+                android:hint="@string/UNO_commands_string_type_hint" />
+
+            <EditText
+                android:id="@+id/UNO_commands_string_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:maxLines="1"
+                android:scrollHorizontally="true"
+                android:inputType="textNoSuggestions"
+                android:hint="@string/UNO_commands_string_value_hint" />
+
+            <ImageButton
+                android:id="@+id/button_add_property"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/image_button_background"
+                android:padding="10dp"
+                app:srcCompat="@drawable/ic_add_black_24dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/android/source/res/layout/toolbar_color_picker.xml b/android/source/res/layout/toolbar_color_picker.xml
new file mode 100644
index 000000000..939325912
--- /dev/null
+++ b/android/source/res/layout/toolbar_color_picker.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    android:background="@color/toolbar_background"
+    android:elevation="3dp"
+    android:orientation="vertical"
+    app:popupTheme="@style/LibreOfficeTheme.Toolbar"
+    app:theme="@style/LibreOfficeTheme.Toolbar"
+    tools:showIn="@layout/activity_main"
+    app:layout_behavior="android.support.design.widget.BottomSheetBehavior"
+    app:behavior_hideable="true"
+    app:behavior_peekHeight="0dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:orientation="vertical">
+        <ImageButton
+            android:id="@+id/button_go_back_color_picker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:srcCompat="@drawable/ic_arrow_back_black_24dp"
+            android:background="@drawable/image_button_background"
+            android:layout_marginBottom="10dp"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/fontColorView"
+            >
+
+        </android.support.v7.widget.RecyclerView>
+
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/fontColorViewSub"
+            android:layout_marginTop="20dp"
+            android:layout_below="@id/fontColorView"
+            android:layout_alignParentBottom="true">
+
+        </android.support.v7.widget.RecyclerView>
+
+
+    </LinearLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/source/res/menu/context_menu.xml b/android/source/res/menu/context_menu.xml
new file mode 100644
index 000000000..43824875d
--- /dev/null
+++ b/android/source/res/menu/context_menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/context_menu_open"
+          android:title="@string/open"/>
+    <item android:id="@+id/context_menu_share"
+          android:title="@string/share"/>
+</menu>
diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml
new file mode 100644
index 000000000..2c97b3201
--- /dev/null
+++ b/android/source/res/menu/main.xml
@@ -0,0 +1,146 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.libreoffice.MainActivity">
+
+    <group android:id="@+id/group_edit_actions"
+           tools:visible="true"
+           android:visible="false">
+
+        <item android:id="@+id/action_undo"
+              android:title="@string/action_undo"
+              android:icon="@drawable/ic_undo"
+              android:orderInCategory="100"
+              app:showAsAction="always"/>
+
+        <item android:id="@+id/action_redo"
+              android:title="@string/action_redo"
+              android:icon="@drawable/ic_redo"
+              android:orderInCategory="100"
+              app:showAsAction="always"/>
+
+        <item android:id="@+id/action_keyboard"
+              android:title="@string/action_keyboard"
+              android:icon="@drawable/ic_keyboard"
+              android:orderInCategory="100"
+              app:showAsAction="always"/>
+
+        <item android:id="@+id/action_format"
+            android:title="@string/action_fromat"
+            android:icon="@drawable/ic_text_format"
+            android:orderInCategory="100"
+            app:showAsAction="always"/>
+
+
+        <item android:id="@+id/action_save"
+            android:title="@string/action_save"
+            android:orderInCategory="100" />
+
+        <item android:id="@+id/action_exportToPDF"
+            android:title="@string/action_exportToPDF"
+            android:orderInCategory="100"
+            android:visible="true"
+            />
+
+        <item android:id="@+id/action_print"
+            android:title="@string/action_print"
+            android:orderInCategory="100"
+            android:visible="true" />
+
+        <item android:id="@+id/action_UNO_commands"
+            android:title="@string/action_UNO_commands"
+            android:orderInCategory="100" />
+    </group>
+
+    <group android:id="@+id/group_spreadsheet_options"
+        android:visible="false"
+        tools:visible="true">
+
+        <item android:id="@+id/action_add_worksheet"
+            android:title="@string/action_add_worksheet"
+            android:orderInCategory="100"
+            android:visible="false" />
+
+        <item android:id="@+id/action_rename_worksheet"
+            android:title="@string/action_rename_worksheet"
+            android:orderInCategory="100"
+            android:visible="false" />
+
+        <item android:id="@+id/action_delete_worksheet"
+            android:title="@string/action_delete_worksheet"
+            android:orderInCategory="100"
+            android:visible="false"/>
+    </group>
+
+    <group android:id="@+id/group_presentation_options"
+        android:visible="false"
+        tools:visible="true">
+
+        <item android:id="@+id/action_add_slide"
+            android:title="@string/action_add_slide"
+            android:orderInCategory="100"
+            android:visible="false" />
+        <item android:id="@+id/action_rename_slide"
+            android:title="@string/action_rename_slide"
+            android:orderInCategory="100"
+            android:visible="false" />
+
+        <item android:id="@+id/action_delete_slide"
+            android:title="@string/action_delete_slide"
+            android:orderInCategory="100"
+            android:visible="false"/>
+    </group>
+
+    <group android:id="@+id/group_edit_clipboard"
+        android:visible="false"
+        tools:visible="true">
+
+        <item android:id="@+id/action_back"
+            android:title="@string/action_back"
+            app:showAsAction="always"
+            android:icon="@drawable/ic_arrow_back_black_24dp"
+            android:orderInCategory="1"/>
+
+        <item android:id="@+id/action_copy"
+            android:title="@string/action_copy"
+            app:showAsAction="always"
+            android:icon="@drawable/ic_content_copy_black_24dp"
+            android:orderInCategory="2"/>
+
+        <item android:id="@+id/action_cut"
+            android:title="@string/action_cut"
+            app:showAsAction="always"
+            android:icon="@drawable/ic_content_cut_black_24dp"
+            android:orderInCategory="3"/>
+
+        <item android:id="@+id/action_paste"
+            android:title="@string/action_paste"
+            app:showAsAction="always"
+            android:icon="@drawable/ic_content_paste_black_24dp"
+            android:orderInCategory="4"/>
+
+    </group>
+
+    <item android:id="@+id/action_search"
+        android:title="@string/action_search"
+        android:icon="@drawable/ic_search"
+        android:orderInCategory="100"
+        app:showAsAction="always"/>
+
+    <item android:id="@+id/action_presentation"
+        android:title="@string/action_presentation"
+        android:orderInCategory="100"
+        android:visible="false" />
+
+    <item android:id="@+id/action_parts"
+          android:title="@string/action_parts"
+          android:orderInCategory="100" />
+
+    <item android:id="@+id/action_about"
+          android:title="@string/action_about"
+          android:orderInCategory="100" />
+
+    <item android:id="@+id/action_settings"
+          android:title="@string/action_settings"
+          android:orderInCategory="100" />
+</menu>
diff --git a/android/source/res/menu/navigation_menu.xml b/android/source/res/menu/navigation_menu.xml
new file mode 100644
index 000000000..db680a9a1
--- /dev/null
+++ b/android/source/res/menu/navigation_menu.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <group
+        android:checkableBehavior="single"
+        android:id="@+id/group_providers">
+
+        <item android:id="@+id/menu_provider_documents"
+            android:title="@string/local_documents"
+            android:icon="@drawable/ic_folder_black_24dp" />
+
+        <item android:id="@+id/menu_provider_filesystem"
+            android:title="@string/local_file_system"
+            android:icon="@drawable/ic_storage_black_24dp"/>
+
+        <item android:id="@+id/menu_provider_extsd"
+            android:title="@string/external_sd_file_system"
+            android:icon="@drawable/ic_sd_card_black_24dp"/>
+
+        <item android:id="@+id/menu_provider_otg"
+            android:title="@string/otg_file_system"
+            android:icon="@drawable/ic_usb_black_24dp"/>
+
+        <item android:id="@+id/menu_provider_owncloud"
+            android:title="@string/owncloud"
+            android:icon="@drawable/ic_cloud_black_24dp"/>
+
+
+    </group>
+
+    <group android:orderInCategory="100">
+        <item android:id="@+id/menu_storage_preferences"
+            android:title="@string/storage_provider_settings"
+            android:icon="@drawable/ic_settings_black_24dp"/>
+    </group>
+</menu>
diff --git a/android/source/res/menu/view_menu.xml b/android/source/res/menu/view_menu.xml
new file mode 100644
index 000000000..67f059647
--- /dev/null
+++ b/android/source/res/menu/view_menu.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_filter"
+        android:title="@string/filter"
+        android:icon="@drawable/ic_filter_list_black_24dp"
+        app:showAsAction="ifRoom">
+        <menu>
+            <group
+                android:checkableBehavior="single">
+                <item
+                    android:id="@+id/menu_filter_everything"
+                    android:title="@string/filter_everything" />
+                <item
+                    android:id="@+id/menu_filter_documents"
+                    android:title="@string/filter_documents" />
+                <item
+                    android:id="@+id/menu_filter_spreadsheets"
+                    android:title="@string/filter_spreadsheets" />
+                <item
+                    android:id="@+id/menu_filter_presentations"
+                    android:title="@string/filter_presentations" />
+                <item
+                    android:id="@+id/menu_filter_drawings"
+                    android:title="@string/filter_drawings" />
+            </group>
+        </menu>
+    </item>
+
+    <item
+        android:id="@+id/menu_sort"
+        android:title="@string/sort"
+        android:icon="@drawable/ic_sort_black_24dp"
+        app:showAsAction="ifRoom">
+        <menu>
+            <group android:checkableBehavior="single">
+                <item android:id="@+id/menu_sort_size_asc"
+                    android:title="@string/sort_smallest" />
+
+                <item android:id="@+id/menu_sort_size_desc"
+                    android:title="@string/sort_largest" />
+
+                <item android:id="@+id/menu_sort_az"
+                    android:title="@string/sort_az"/>
+
+                <item android:id="@+id/menu_sort_za"
+                    android:title="@string/sort_za"/>
+
+                <item android:id="@+id/menu_sort_modified_newest"
+                    android:title="@string/sort_newest"/>
+
+                <item android:id="@+id/menu_sort_modified_oldest"
+                    android:title="@string/sort_oldest"/>
+            </group>
+        </menu>
+    </item>
+    <item android:id="@+id/action_settings"
+          android:title="@string/action_settings"
+          android:orderInCategory="100"/>
+    <item android:id="@+id/action_about"
+        android:title="@string/action_about"
+        android:orderInCategory="100"/>
+</menu>
diff --git a/android/source/res/mipmap-hdpi/ic_launcher.png b/android/source/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..f8b74553e
Binary files /dev/null and b/android/source/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-mdpi/ic_launcher.png b/android/source/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..fa68d30f0
Binary files /dev/null and b/android/source/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xhdpi/ic_launcher.png b/android/source/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..12069c7e8
Binary files /dev/null and b/android/source/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xxhdpi/ic_launcher.png b/android/source/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..a00a40dbe
Binary files /dev/null and b/android/source/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/source/res/mipmap-xxxhdpi/ic_launcher.png b/android/source/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..ef7067cbd
Binary files /dev/null and b/android/source/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/source/res/values-de/strings.xml b/android/source/res/values-de/strings.xml
new file mode 100644
index 000000000..a4f88b274
--- /dev/null
+++ b/android/source/res/values-de/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">LibreOffice Viewer</string>
+    <string name="app_name_settings">LibreOffice-Viewer-Einstellungen</string>
+
+    <string name="app_about_name"><b>LibreOffice Viewer \'Beta\'</b></string>
+    <string name="app_version">Version: %1$s\nBuild ID: %2$s</string>
+    <string name="app_description">LibreOffice Viewer ist ein Dokumentenbetrachter, der auf LibreOffice basiert.</string>
+    <string name="app_credits">https://www.libreoffice.org</string>
+    <string name="app_vendor">Dieses Release wurde bereitgestellt durch $VENDOR.</string>
+    <string name="temp_file_saving_disabled">Diese Datei ist schreibgeschützt, Speichern ist deaktiviert.</string>
+
+    <string name="about_license">Lizenz anzeigen</string>
+    <string name="about_notice">Hinweise anzeigen</string>
+    <string name="about_moreinfo">Weitere Informationen</string>
+    <string name="back_again_to_quit">Zum Beenden noch einmal \'zurück\' drücken</string>
+
+    <string name="new_textdocument">Neues Textdokument</string>
+    <string name="new_presentation">Neue Präsentation</string>
+    <string name="new_spreadsheet">Neues Tabellendokument</string>
+    <string name="new_drawing">Neue Zeichnung</string>
+    <string name="default_document_name">unbenannt</string>
+
+    <string name="browser_app_name">LibreOffice Browser</string>
+    <string name="menu_search">Suchen</string>
+    <string name="list_view">Liste</string>
+    <string name="grid_view">Gitter</string>
+    <string name="filter">Filtern nach</string>
+    <string name="search_not_found">Suchbegriff nicht gefunden</string>
+    <string name="sort">Sortieren nach</string>
+    <string name="sort_smallest">Kleinste zuerst</string>
+    <string name="sort_largest">Größte zuerst</string>
+    <string name="sort_az">A-Z</string>
+    <string name="sort_za">Z-A</string>
+    <string name="sort_oldest">Älteste zuerst</string>
+    <string name="sort_newest">Neueste zuerst</string>
+    <string name="menu_sort_size">Nach Größe sortieren</string>
+    <string name="menu_sort_az">Von A bis Z sortieren</string>
+    <string name="menu_sort_modified">Nach Datum sortieren</string>
+    <string name="menu_preferences">Einstellungen</string>
+    <string name="file_icon_desc">Datei-Icon</string>
+    <string name="title_recents">Zuletzt verwendete Dateien</string>
+    <string name="title_browser">Alle Dateien</string>
+    <!-- Pref keys as resources ; Not currently used -->
+    <string name="EXPLORER_VIEW_TYPE_KEY">EXPLORER_VIEW_TYPE</string>
+    <string name="CURRENT_DIRECTORY_KEY">CURRENT_DIRECTORY</string>
+    <string name="pref_category_explorer">Dateimanager-Einstellungen</string>
+    <string name="pref_category_general">Allgemein</string>
+    <string name="pref_experimental_editing">Experimenteller Modus</string>
+    <string name="pref_experimental_editing_summary">Den experimentellen Editier-Modus aktivieren. Verwendung auf eigene Gefahr.</string>
+    <string name="pref_show_hidden_files">Versteckte Dateien/Ordner</string>
+    <string name="pref_show_hidden_files_summary">Anzeige versteckter Dateien/Ordner aktivieren</string>
+    <string name="pref_developer_mode">Entwickler-Modus</string>
+    <string name="pref_developer_mode_summary">Entwickler-Modus, in dem in der App UNO-Kommandos gesendet werden können. Verwendung auf eigene Gefahr.</string>
+
+    <string name="action_about">Info</string>
+    <string name="action_parts">Abschnitte</string>
+    <string name="action_settings">Einstellungen</string>
+    <string name="open">Öffnen</string>
+    <string name="share">Teilen</string>
+    <string name="share_via">Teilen via</string>
+
+    <!-- Document browser filters -->
+    <string name="filter_everything">Alles</string>
+    <string name="filter_documents">Dokumente</string>
+    <string name="filter_spreadsheets">Tabellendokumente</string>
+    <string name="filter_presentations">Präsentationen</string>
+    <string name="filter_drawings">Zeichnungen</string>
+
+    <!-- Document provider names -->
+    <string name="document_locations">Dokumentenorte</string>
+    <string name="close_document_locations">Dokumentenorte schließen</string>
+    <string name="local_documents">Dokumentenverzeichnis</string>
+    <string name="local_file_system">Lokales Dateisystem</string>
+    <string name="external_sd_file_system">Externe SD</string>
+    <string name="otg_file_system">OTG-Gerät (experimentell)</string>
+    <string name="owncloud">Entfernter Server</string>
+    <string name="usb_connected_configure">USB verbunden, richten Sie Ihr Gerät ein.</string>
+
+    <string name="owncloud_wrong_connection">Verbindung mit dem ownCloud-Server nicht möglich. Prüfen Sie die Einstellungen.</string>
+    <string name="owncloud_unauthorized">Anmeldung am ownCloud-Server nicht möglich. Prüfen Sie die Einstellungen.</string>
+    <string name="owncloud_unspecified_error">Nicht näher spezifizierter Fehler beim Verbindungsaufbau zum ownCloud-Server. Prüfen Sie die Einstellungen und/oder versuchen Sie es später.</string>
+
+    <string name="ext_document_provider_error">Ungültige Wurzel-Datei. Prüfen Sie die SD-Karten-Einstellungen.</string>
+    <string name="legacy_extsd_missing_error">Ungültige Wurzel-Datei. Prüfen Sie die externe SD-Karte und/oder die Einstellungen</string>
+    <string name="otg_missing_error">Ungültige Wurzel-Datei. Prüfen Sie Ihr OTG-Gerät und/oder die Einstellungen.</string>
+
+    <!-- Edit action names -->
+    <string name="action_bold">Fett</string>
+    <string name="action_underline">Unterstrichen</string>
+    <string name="action_italic">Kursiv</string>
+    <string name="action_strikeout">Durchgestrichen</string>
+    <string name="action_keyboard">Tastatur anzeigen</string>
+    <string name="action_save">Speichern</string>
+    <string name="action_fromat">Format anwenden</string>
+    <string name="action_search">Suchen</string>
+    <string name="action_UNO_commands">UNO-Kommando senden</string>
+
+    <!-- Feedback messages -->
+    <string name="message_saved">Speichern beendet</string>
+    <string name="message_saving">Dokument wird gespeichert…</string>
+    <string name="message_save_incomplete">Speichern unvollständig. Gab es Änderungen?</string>
+    <string name="create_new_file_success">"Neue Datei angelegt - "</string>
+    <string name="create_new_file_error">Neue Datei konnte nicht angelegt weden, bitte Prüfen Sie den eingegeben Dateinamen.</string>
+
+    <!-- Document provider settings -->
+    <string name="storage_provider_settings">Speicheranbieter-Einstellungen</string>
+    <string name="owncloud_settings">ownCloud-Einstellungen</string>
+    <string name="physical_storage_settings">Einstellungen für physikalischen Speicher</string>
+    <string name="external_sd_path">Pfad zur externen SD-Karte</string>
+    <string name="otg_device_path">Pfad zum OTG-Gerät</string>
+    <string name="otg_warning">Experimentelles Feature: Nur verwenden, wenn OTG-Gerät beschreibbar ist.</string>
+    <string name="server_url">Server-URL</string>
+    <string name="server_url_and_port">URL und Port des ownCloud-Servers.</string>
+    <string name="user_name">Benutzername</string>
+    <string name="password">Passwort</string>
+    <string name="action_undo">Rückgängig</string>
+    <string name="action_redo">Wiederherstellen</string>
+
+    <!-- Directory browser strings -->
+    <string name="up_description">Nach oben</string>
+    <string name="confirm_label">Bestätigen</string>
+    <string name="cancel_label">Abbrechen</string>
+    <string name="search_label">Los</string>
+    <string name="directory_browser_label">Verzeichnis auswählen</string>
+    <string name="bad_directory">Ungültiger Verzeichnispfad</string>
+    <string name="current_dir">Aktuelles Verzeichnis: %1$s</string>
+
+    <!-- Save Alert dialog strings -->
+    <string name="save_alert_dialog_title">Dokument vor dem Schließen speichern?</string>
+    <string name="save_document">SPEICHERN</string>
+    <string name="action_cancel">Abbrechen</string>
+    <string name="no_save_document">NEIN</string>
+
+    <!-- Create New Document Dialog Strings -->
+    <string name="create_new_document_title">Dateiname eingeben</string>
+    <string name="action_create">ANLEGEN</string>
+
+    <!-- Presentation Mode Strings -->
+    <string name="action_presentation">Präsentation</string>
+    <string name="action_add_slide">Folie hinzufügen</string>
+    <string name="alert_copy_svg_slide_show_to_clipboard">Ihr Android-Gerät unterstützt keine In-App-SVG-Präsentation. Wir haben den Link zur Präsentation in die Zwischenablage kopiert. Drücken Sie den Home-Button, öffnen Sie einen modernen Web-Browser, fügen Sie in die Adressleiste ein und los.</string>
+    <string name="alert_copy_svg_slide_show_to_clipboard_dismiss">OK</string>
+    <string name="slideshow_action_back">Zurück</string>
+
+    <!-- Calc Header Menu Strings -->
+    <string name="calc_insert_before">Einfügen</string>
+    <string name="calc_delete">Löschen</string>
+    <string name="calc_hide">Verstecken</string>
+    <string name="calc_show">Anzeigen</string>
+    <string name="calc_optimal_length">Optimale Länge</string>
+    <string name="calc_adjust_length">Länge Anpassen</string>
+    <string name="calc_adjust_height">Höhe Anpassen</string>
+    <string name="calc_adjust_width">Breit Anpassen</string>
+    <string name="calc_optimal_height">Optimale Höhe</string>
+    <string name="calc_optimal_width">Optimale Breite</string>
+    <string name="calc_optimal_length_confirm">OK</string>
+    <string name="calc_optimal_length_default_text">Geben Sie die zusätzliche Höhe in 100tel/mm ein</string>
+    <string name="calc_alert_double_click_optimal_length">Hinweis: Doppeltes Antippen auf eine Überschrift setzt die optimale Breite/Höhe.</string>
+    <string name="action_add_worksheet">Arbeitsblatt hinzufügen</string>
+
+    <!-- Password dialog strings -->
+    <string name="action_pwd_dialog_OK">OK</string>
+    <string name="action_pwd_dialog_cancel">Abbrechen</string>
+    <string name="action_pwd_dialog_title">Bitte Passwort eingeben</string>
+
+    <!-- Insert Image Strings -->
+    <string name="take_photo">Foto Machen</string>
+    <string name="select_photo">Foto Auswählen</string>
+    <string name="select_photo_title">Bild Auswählen</string>
+    <string name="no_camera_found">Keine Kamera gefunden</string>
+    <string name="compress_photo_smallest_size">Kleinste Größe</string>
+    <string name="compress_photo_medium_size">Mittlere Größe</string>
+    <string name="compress_photo_max_quality">Maximale Qualität</string>
+    <string name="compress_photo_no_compress">Nicht komprimieren</string>
+    <string name="compress_photo_title">Wollen Sie das Foto komprimieren?</string>
+
+    <!-- Clipboard Actions -->
+    <string name="action_copy">Kopieren</string>
+    <string name="action_paste">Einfügen</string>
+    <string name="action_cut">Ausschneiden</string>
+    <string name="action_back">Zurück</string>
+    <string name="action_text_copied">Text in die Zwischenlage kopiert</string>
+    <string name="insert_table">Tabelle einfügen</string>
+    <string name="select_insert_options">Einfügeoptionen auswählen:</string>
+    <string name="select_delete_options">Löschoptionen auswählen:</string>
+    <string name="action_rename_worksheet">Arbeitsblatt umbenennen</string>
+    <string name="action_delete_worksheet">Arbeitsblatt löschen</string>
+    <string name="action_delete_slide">Folie löschen</string>
+    <string name="name_already_used">Der angegebene Name wird bereits verwendet.</string>
+    <string name="part_name_changed">Der Name für den Abschnitt wurde geändert.</string>
+    <string name="part_deleted">Der Abschnitt wurde gelöscht.</string>
+    <string-array name="insertrowscolumns">
+        <item>Zeilen Davor Einfügen</item>
+        <item>Zeilen Dahinter Einfügen</item>
+        <item>Spalten Davor Einfügen</item>
+        <item>Spalten Danach Einfügen</item>
+        <item>Tabelle Einfügen</item>
+    </string-array>
+    <string-array name="deleterowcolumns">
+        <item>Zeilen Löschen</item>
+        <item>Spalten Löschen</item>
+        <item>Tabelle Löschen</item>
+    </string-array>
+
+    <!-- UNO cmd controller Strings -->
+    <string name="UNO_commands_string_hint">UNO-Kommando</string>
+    <string name="UNO_commands_string_type_hint">Typ</string>
+    <string name="UNO_commands_string_value_hint">Wert</string>
+    <string name="UNO_commands_string_parent_value_hint">Wert des Parents</string>
+    <string name="action_exportToPDF">Als PDF Exportieren</string>
+    <string name="action_print">Drucken</string>
+    <string name="tabhost_character">Zeichen</string>
+    <string name="tabhost_paragraph">Absatz</string>
+    <string name="tabhost_insert">Einfügen</string>
+    <string name="tabhost_style">Format</string>
+    <string name="alert_ok">OK</string>
+    <string name="alert_cancel">Abbrechen</string>
+    <string name="unable_to_go_further">Kann nicht weiter gehen.</string>
+    <string name="current_uno_command">Aktuelles UNO-Kommando</string>
+    <string name="pref_sort_summary">Sortiermodus für Dateien auswählen: A-Z, nach Größe oder nach Datum.</string>
+    <string name="pref_viewmode_summary">Dateien als Gitter oder als Liste anzeigen.</string>
+    <string name="pref_file_explorer_title">Dateimanager-Layout</string>
+    <string name="pref_sort_title">Datei-Reihenfolge</string>
+    <string name="pref_filter_title">Standard-Dateifilter</string>
+    <string name="pref_filter_summary">Wählen Sie, welcher Dateifilter standardmäßig verwendet werden soll.</string>
+    <string name="display_language">Anzeigesprache</string>
+    <string name="display_language_summary">Wählen Sie die Standard-Anzeigesprache</string>
+    <string name="unable_to_export_pdf">PDF-Export nicht möglich</string>
+    <string name="pdf_exported_at">PDF exportiert nach</string>
+    <string name="printing_not_supported">Ihr Gerät unterstützt Drucken nicht</string>
+    <string name="error">Fehler</string>
+    <string name="enter_part_name">Name für Abschnitt eingeben</string>
+    <string name="bmp_null">Bmp ist null!</string>
+    <string name="directory_not_saved">Verzeichnis nicht gespeichert.</string>
+    <string name="page">Seite</string>
+    <string name="sheet">Arbeitsblatt</string>
+    <string name="slide">Folie</string>
+    <string name="part">Abschnitt</string>
+    <string name="highlight_color">Hervorhebungs-Farbe</string>
+    <string name="font_color">Schriftfarbe</string>
+    <string name="action_rename_slide">Folie umbenennen</string>
+</resources>
diff --git a/android/source/res/values-tr/strings.xml b/android/source/res/values-tr/strings.xml
new file mode 100644
index 000000000..3bada4ded
--- /dev/null
+++ b/android/source/res/values-tr/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">LibreOffice Görüntüleyici</string>
+    <string name="app_name_settings">LibreOffice Görüntüleyici Ayarları</string>
+
+    <string name="app_about_name"><b>LibreOffice Görüntüleyici \'Beta\'</b></string>
+    <string name="app_version">Versiyon: %1$s\nBuild ID: %2$s</string>
+    <string name="app_description">LibreOffice Görüntüleyici LibreOffice tabanlı bir belge görüntüleyicisidir.</string>
+    <string name="app_credits">https://www.libreoffice.org</string>
+    <string name="app_vendor">Bu sürüm $VENDOR tarafından derlenmiştir.</string>
+    <string name="temp_file_saving_disabled">Bu dosya salt okunabilir haldedir. Kaydetme devredışı.</string>
+
+    <string name="about_license">Lisansı Görüntüle</string>
+    <string name="about_notice">Bildiriyi Görüntüle</string>
+    <string name="about_moreinfo">Daha Fazla Bilgi</string>
+    <string name="back_again_to_quit">Çıkış için geri tuşuna tekrar basınız.</string>
+
+    <string name="new_textdocument">Yeni Kelime İşlemci</string>
+    <string name="new_presentation">Yeni Sunum</string>
+    <string name="new_spreadsheet">Yeni Hesap Tablosu</string>
+    <string name="new_drawing">Yeni Çizim</string>
+    <string name="default_document_name">adsız</string>
+
+    <string name="browser_app_name">LibreOffice Tarayıcı</string>
+    <string name="menu_search">Ara</string>
+    <string name="list_view">Liste</string>
+    <string name="grid_view">Grid</string>
+    <string name="filter">Şununla filtrele:</string>
+    <string name="search_not_found">Söz dizimi bulunamadı.</string>
+    <string name="sort">Şununla sırala:</string>
+    <string name="sort_smallest">Küçükten büyüğe</string>
+    <string name="sort_largest">Büyükten küçüğe</string>
+    <string name="sort_az">A-Z</string>
+    <string name="sort_za">Z-A</string>
+    <string name="sort_oldest">Eskiden yeniye</string>
+    <string name="sort_newest">Yeniden eskiye</string>
+    <string name="menu_sort_size">Boyuta Göre Sırala</string>
+    <string name="menu_sort_az">Alfabetik Sırala</string>
+    <string name="menu_sort_modified">Tarihe Göre Sırala</string>
+    <string name="menu_preferences">Seçenekler</string>
+    <string name="file_icon_desc">dosya_simgesi</string>
+    <string name="title_recents">Son açılan dosyalar</string>
+    <string name="title_browser">Tüm dosyalar</string>
+    <!-- Pref keys as resources ; Not currently used -->
+    <string name="EXPLORER_VIEW_TYPE_KEY">EXPLORER_VIEW_TYPE</string>
+    <string name="CURRENT_DIRECTORY_KEY">CURRENT_DIRECTORY</string>
+    <string name="pref_category_explorer">Dosya Gezgini Ayarları</string>
+    <string name="pref_category_general">Genel</string>
+    <string name="pref_experimental_editing">Deneysel Mod</string>
+    <string name="pref_experimental_editing_summary">Deneysel düzenleme modunu etkinleştirin. Kullanım riski size aittir.</string>
+    <string name="pref_show_hidden_files">Gizli Dosyalar ve Dizinler</string>
+    <string name="pref_show_hidden_files_summary">Gizli dosyalar ve dizinleri göstermeyi etkinleştir.</string>
+    <string name="pref_developer_mode">Geliştirici Modu</string>
+    <string name="pref_developer_mode_summary">Geliştirici modunu etkinleştirerek UNO komutları gönderin. Kullanım riski size aittir.</string>
+
+    <string name="action_about">Hakkında</string>
+    <string name="action_parts">Bölümler</string>
+    <string name="action_settings">Ayarlar</string>
+    <string name="open">Aç</string>
+    <string name="share">Paylaş</string>
+    <string name="share_via">Şununla paylaş</string>
+
+    <!-- Document browser filters -->
+    <string name="filter_everything">Hepsi</string>
+    <string name="filter_documents">Kelime İşlemci</string>
+    <string name="filter_spreadsheets">Hesap Tablosu</string>
+    <string name="filter_presentations">Sunum</string>
+    <string name="filter_drawings">Çizimler</string>
+
+    <!-- Document provider names -->
+    <string name="document_locations">Belge dizinleri</string>
+    <string name="close_document_locations">Belge dizinlerini kapat</string>
+    <string name="local_documents">Belgeler</string>
+    <string name="local_file_system">Yerel dosya sistemi</string>
+    <string name="external_sd_file_system">Harici SD</string>
+    <string name="otg_file_system">OTG cihazı (deneysel)</string>
+    <string name="owncloud">Uzak sunucu</string>
+    <string name="usb_connected_configure">USB bağlantısı yapıldı, cihazınızın ayarlarını yapınız.</string>
+
+    <string name="owncloud_wrong_connection">ownCloud sunucusuna bağlanılamadı. Ayarlarınızı kontrol ediniz.</string>
+    <string name="owncloud_unauthorized">ownCloud sunucusuna giriş yapılamadı. Ayarlarınızı kontrol ediniz.</string>
+    <string name="owncloud_unspecified_error">ownCloud sunucusuna bağlanırken belirtilmemiş bir hata oluştu. Lütfen daha sonra tekrar deneyiniz veya ayarlarınızı kontrol ediniz.</string>
+
+    <string name="ext_document_provider_error">Geçersiz dizin. SD kart ayarlarınızı kontrol ediniz.</string>
+    <string name="legacy_extsd_missing_error">Geçersiz dizin. SD kartınızı veya SD kart ayarlarınızı kontrol ediniz.</string>
+    <string name="otg_missing_error">Geçersiz dizin. OTG cihazınızı veya OTG cihazı ayarlarınızı kontrol ediniz.</string>
+
+    <!-- Edit action names -->
+    <string name="action_bold">Kalın</string>
+    <string name="action_underline">Altı çizgili</string>
+    <string name="action_italic">Yana yatık</string>
+    <string name="action_strikeout">Üzeri çizgili</string>
+    <string name="action_keyboard">Klaveyi göster</string>
+    <string name="action_save">Kaydet</string>
+    <string name="action_fromat">Biçimlendirmeyi etkinleştir.</string>
+    <string name="action_search">Ara</string>
+    <string name="action_UNO_commands">UNO komutu yolla</string>
+
+    <!-- Feedback messages -->
+    <string name="message_saved">Kaydetme tamamlandı.</string>
+    <string name="message_saving">Belge kaydediliyor…</string>
+    <string name="message_save_incomplete">Kayıt tamamlanmadı. Değişiklik yapıldı mı?</string>
+    <string name="create_new_file_success">"Yeni dosya oluşturuldu - "</string>
+    <string name="create_new_file_error">Yeni dosya oluşturma başarısız. Lütfen dosya ismini kontrol ediniz.</string>
+
+    <!-- Document provider settings -->
+    <string name="storage_provider_settings">Depolama sağlayıcısı ayarları</string>
+    <string name="owncloud_settings">ownCloud ayarları</string>
+    <string name="physical_storage_settings">Fiziksel depolama ayarları</string>
+    <string name="external_sd_path">Harici SD yolu</string>
+    <string name="otg_device_path">OTG cihazı yolu</string>
+    <string name="otg_warning">Deneysel özellik: OTG cihazı yazılabilir ise kullanın</string>
+    <string name="server_url">Sunucu URL</string>
+    <string name="server_url_and_port">ownCloud sunucusu URL ve port</string>
+    <string name="user_name">Kullanıcı Adı</string>
+    <string name="password">Parola</string>
+    <string name="action_undo">Geri Al</string>
+    <string name="action_redo">Yinele</string>
+
+    <!-- Directory browser strings -->
+    <string name="up_description">Üst dizin</string>
+    <string name="confirm_label">Onayla</string>
+    <string name="cancel_label">İptal</string>
+    <string name="search_label">Git</string>
+    <string name="directory_browser_label">Dizin Seç</string>
+    <string name="bad_directory">Geçersiz dizin</string>
+    <string name="current_dir">Şuan ki dizin: %1$s</string>
+
+    <!-- Save Alert dialog strings -->
+    <string name="save_alert_dialog_title">Değişiklikleri kaydetmek istiyor musunuz?</string>
+    <string name="save_document">Kaydet</string>
+    <string name="action_cancel">İptal</string>
+    <string name="no_save_document">Hayır</string>
+
+    <!-- Create New Document Dialog Strings -->
+    <string name="create_new_document_title">Dosya ismi girin</string>
+    <string name="action_create">OLUŞTUR</string>
+
+    <!-- Presentation Mode Strings -->
+    <string name="action_presentation">Slayt Gösterisi</string>
+    <string name="action_add_slide">Slayt Ekle</string>
+    <string name="alert_copy_svg_slide_show_to_clipboard">Cihazınız uygulama içi slayt gösterisini desteklemiyor. Sunumu panoya kopyaladık. Lütfen ev tuşuna basıp modern bir tarayıcı açıp arama çubuğuna yapıştırın ve sunumu görüntüleyin.</string>
+    <string name="alert_copy_svg_slide_show_to_clipboard_dismiss">Tamam</string>
+    <string name="slideshow_action_back">Geri</string>
+
+    <!-- Calc Header Menu Strings -->
+    <string name="calc_insert_before">Ekle</string>
+    <string name="calc_delete">Sil</string>
+    <string name="calc_hide">Gizle</string>
+    <string name="calc_show">Göster</string>
+    <string name="calc_optimal_length">En iyi uzunluk</string>
+    <string name="calc_adjust_length">Uzunluğu ayarla</string>
+    <string name="calc_adjust_height">Yüksekliği ayarla</string>
+    <string name="calc_adjust_width">Genişliği ayarla</string>
+    <string name="calc_optimal_height">En iyi yükseklikt</string>
+    <string name="calc_optimal_width">En iyi genişlik</string>
+    <string name="calc_optimal_length_confirm">Tamam</string>
+    <string name="calc_optimal_length_default_text">Extra uzunluk giriniz: 100th/mm</string>
+    <string name="calc_alert_double_click_optimal_length">İpucu: Başlığa çift dokunuş en iyi uzunluk ve genişliği ayarlar.</string>
+    <string name="action_add_worksheet">Hesap Tablosu Ekle</string>
+
+    <!-- Password dialog strings -->
+    <string name="action_pwd_dialog_OK">Tamam</string>
+    <string name="action_pwd_dialog_cancel">İptal</string>
+    <string name="action_pwd_dialog_title">Lütfen parola giriniz.</string>
+
+    <!-- Insert Image Strings -->
+    <string name="take_photo">Fotoğraf Çek</string>
+    <string name="select_photo">Fotoğraf Seç</string>
+    <string name="select_photo_title">Resim Seç</string>
+    <string name="no_camera_found">Kamera bulunamadı.</string>
+    <string name="compress_photo_smallest_size">Düşük Kalite</string>
+    <string name="compress_photo_medium_size">Orta Kalite</string>
+    <string name="compress_photo_max_quality">Maksimum Kalite</string>
+    <string name="compress_photo_no_compress">Sıkıştırma yapma</string>
+    <string name="compress_photo_title">Fotoğrafı sıkıştırmak ister misiniz?</string>
+
+    <!-- Clipboard Actions -->
+    <string name="action_copy">Kopyala</string>
+    <string name="action_paste">Yapıştır</string>
+    <string name="action_cut">Kes</string>
+    <string name="action_back">Geri</string>
+    <string name="action_text_copied">Yazı panoya kopyalandı.</string>
+    <string name="insert_table">Tablo Ekle</string>
+    <string name="select_insert_options">Ekleme seçenekleri:</string>
+    <string name="select_delete_options">Silme seçenekleri:</string>
+    <string name="action_rename_worksheet">Hesap tablosunu yeniden adlandır</string>
+    <string name="action_delete_worksheet">Hesap tablosunu sil</string>
+    <string name="action_delete_slide">Slayt sil</string>
+    <string name="name_already_used">Girilen isim zaten kullanılıyor.</string>
+    <string name="part_name_changed">Bölüm ismi değiştirildi.</string>
+    <string name="part_deleted">Bölüm silindi.</string>
+    <string-array name="insertrowscolumns">
+        <item>Satırları öncekine ekle</item>
+        <item>Satırları sonrakine ekle</item>
+        <item>Sütunları öncekine ekle</item>
+        <item>Sütunları sonrakine ekle</item>
+        <item>Tablo Ekle</item>
+    </string-array>
+    <string-array name="deleterowcolumns">
+        <item>Satır Sil</item>
+        <item>Sütun Sil</item>
+        <item>Tablo Sil</item>
+    </string-array>
+
+    <!-- UNO cmd controller Strings -->
+    <string name="UNO_commands_string_hint">UNO Komutu</string>
+    <string name="UNO_commands_string_type_hint">Tip</string>
+    <string name="UNO_commands_string_value_hint">Değer</string>
+    <string name="UNO_commands_string_parent_value_hint">Ebeveyn Değeri</string>
+    <string name="action_exportToPDF">PDF olarak aktar</string>
+    <string name="action_print">Yazdır</string>
+    <string name="tabhost_character">Karakter</string>
+    <string name="tabhost_paragraph">Paragraf</string>
+    <string name="tabhost_insert">Ekle</string>
+    <string name="tabhost_style">Biçim</string>
+    <string name="alert_ok">Tamam</string>
+    <string name="alert_cancel">İptal</string>
+    <string name="unable_to_go_further">Daha fazla ilerlenemiyor.</string>
+    <string name="current_uno_command">Şuan ki UNO komutu</string>
+    <string name="pref_sort_summary">Dosyaların nasıl sıralanacağını seçiniz. A-Z, Z-A ya da boyuta göre.</string>
+    <string name="pref_viewmode_summary">Dosyaları grid veya liste şeklinde görüntüle.</string>
+    <string name="pref_file_explorer_title">Dosya Gezgini</string>
+    <string name="pref_sort_title">Dosya Sıralaması</string>
+    <string name="pref_filter_title">Varsayılan Dosya Filtrelemesi</string>
+    <string name="pref_filter_summary">Varsayılan dosya filtrelemesini seç</string>
+    <string name="display_language">Uygulama Dili</string>
+    <string name="display_language_summary">Varsayılan dili değiştir</string>
+    <string name="unable_to_export_pdf">Pdf dışa aktarılamıyor.</string>
+    <string name="pdf_exported_at">Şu konumda pdf\'e aktarıldı: </string>
+    <string name="printing_not_supported">Cihazınız yazdırmayı desteklemiyor.</string>
+    <string name="error">Hata</string>
+    <string name="enter_part_name">Bölüm ismi girin.</string>
+    <string name="bmp_null">Bmp boş!</string>
+    <string name="directory_not_saved">Dizin kaydedilmedi.</string>
+    <string name="page">Sayfa</string>
+    <string name="sheet">Tablo</string>
+    <string name="slide">Slayt</string>
+    <string name="part">Bölüm</string>
+    <string name="highlight_color">Vurgulama Rengi</string>
+    <string name="font_color">Metin Rengi</string>
+    <string name="action_rename_slide">Slaytı yeniden adlandır</string>
+</resources>
diff --git a/android/source/res/values/arrays.xml b/android/source/res/values/arrays.xml
new file mode 100644
index 000000000..edea6443b
--- /dev/null
+++ b/android/source/res/values/arrays.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer-array name="FilterTypeValues">
+        <item >-1</item>
+        <item >0</item>
+        <item >1</item>
+        <item >2</item>
+    </integer-array>
+    <string-array name="FilterTypeStringValues">
+        <item >-1</item>
+        <item >0</item>
+        <item >1</item>
+        <item >2</item>
+        <item >3</item>
+    </string-array>
+    <string-array name="SupportedLanguagesValues">
+        <item>SYSTEM_DEFAULT_LANGUAGE</item>
+        <item >de</item>
+        <item >en</item>
+        <item >tr</item>
+    </string-array>
+    <string-array name="SortModeStringValues">
+        <item >0</item>
+        <item >1</item>
+        <item >2</item>
+        <item >3</item>
+        <item >4</item>
+        <item >5</item>
+    </string-array>
+    <!-- View Mode names,values -->
+    <string-array name="ViewModeNames">
+        <item >@string/grid_view</item>
+        <item >@string/list_view</item>
+    </string-array>
+    <string-array name="ViewModeStringValues">
+        <item >0</item>
+        <item >1</item>
+    </string-array>
+    <string-array name="FilterTypeNames">
+        <item>@string/filter_everything</item>
+        <item>@string/filter_documents</item>
+        <item>@string/filter_spreadsheets</item>
+        <item>@string/filter_presentations</item>
+        <item>@string/filter_drawings</item>
+    </string-array>
+    <string-array name="SupportedLanguages">
+        <item>(System Default)</item>
+        <item>Deutsch</item>
+        <item>English</item>
+        <item>Turkçe</item>
+    </string-array>
+    <string-array name="SortModeNames">
+        <item >@string/sort_az</item>
+        <item >@string/sort_za</item>
+        <item >@string/sort_oldest</item>
+        <item >@string/sort_newest</item>
+        <item >@string/sort_largest</item>
+        <item >@string/sort_smallest</item>
+    </string-array>
+
+
+</resources>
diff --git a/android/source/res/values/colors.xml b/android/source/res/values/colors.xml
new file mode 100644
index 000000000..3defb9a3e
--- /dev/null
+++ b/android/source/res/values/colors.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<resources>
+    <color name="background_light">#FAFAFA</color> <!--Material Grey 50-->
+    <color name="background_normal">#F5F5F5</color> <!--Material Grey 100-->
+    <color name="background_private">#FF292C29</color>
+    <color name="background_tabs">#FF363B40</color>
+    <color name="highlight">#33000000</color>
+    <color name="highlight_focused">#1A000000</color>
+    <color name="highlight_dark">#33FFFFFF</color>
+    <color name="highlight_dark_focused">#1AFFFFFF</color>
+
+    <!-- highlight on shaped button: 20% white over background_tabs -->
+    <color name="highlight_shaped">#FF696D71</color>
+
+    <!-- highlight-focused on shaped button: 10% white over background_tabs -->
+    <color name="highlight_shaped_focused">#FF565B60</color>
+
+    <!-- highlight on nav button: 20% black over background_normal -->
+    <color name="highlight_nav">#FFA5ACB2</color>
+
+    <!-- highlight-focused on nav button: 10% black over background_normal -->
+    <color name="highlight_nav_focused">#FFB9C1C7</color>
+
+    <!-- highlight on private nav button: 20% white over background_private -->
+    <color name="highlight_nav_pb">#FF545654</color>
+
+    <!-- highlight-focused on private nav button: 10% white over background_private -->
+    <color name="highlight_nav_focused_pb">#FF3F423F</color>
+
+    <!--
+        Application theme colors
+    -->
+    <!-- Default colors -->
+    <color name="text_color_primary">#222222</color>
+    <color name="text_color_secondary">#777777</color>
+    <color name="text_color_tertiary">#9198A1</color>
+
+    <!-- Default inverse colors -->
+    <color name="text_color_primary_inverse">#FFFFFF</color>
+    <color name="text_color_secondary_inverse">#DDDDDD</color>
+    <color name="text_color_tertiary_inverse">#A4A7A9</color>
+
+    <!-- Disabled colors -->
+    <color name="text_color_primary_disable_only">#999999</color>
+
+    <!-- Hint colors -->
+    <color name="text_color_hint">#666666</color>
+    <color name="text_color_hint_inverse">#7F828A</color>
+
+    <!-- Highlight colors -->
+    <color name="text_color_highlight">#FF9500</color>
+    <color name="text_color_highlight_inverse">#D06BFF</color>
+
+    <!-- Link colors -->
+    <color name="text_color_link">#22629E</color>
+
+    <color name="splash_background">#000000</color>
+    <color name="splash_msgfont">#ffffff</color>
+    <color name="splash_urlfont">#000000</color>
+    <color name="splash_content">#ffffff</color>
+
+    <color name="doorhanger_text">#FF222222</color>
+    <color name="doorhanger_link">#FF2AA1FE</color>
+    <color name="doorhanger_divider_light">#FFD1D5DA</color>
+    <color name="doorhanger_divider_dark">#FFB3C2CE</color>
+    <color name="doorhanger_background_dark">#FFDDE4EA</color>
+
+    <color name="validation_message_text">#ffffff</color>
+    <color name="url_bar_text_highlight">#FFFF9500</color>
+    <color name="url_bar_text_highlight_pb">#FFD06BFF</color>
+    <color name="suggestion_primary">#dddddd</color>
+    <color name="suggestion_pressed">#bbbbbb</color>
+    <color name="tab_row_pressed">#4D000000</color>
+    <color name="dialogtitle_textcolor">#ffffff</color>
+
+    <color name="textbox_background">#FFF</color>
+    <color name="textbox_background_disabled">#DDD</color>
+    <color name="textbox_stroke">#000</color>
+    <color name="textbox_stroke_disabled">#666</color>
+
+    <color name="url_bar_urltext">#A6A6A6</color>
+    <color name="url_bar_domaintext">#000</color>
+    <color name="url_bar_domaintext_private">#FFF</color>
+    <color name="url_bar_blockedtext">#b14646</color>
+    <color name="url_bar_shadow">#12000000</color>
+
+    <color name="home_last_tab_bar_bg">#FFF5F7F9</color>
+
+    <color name="panel_grid_item_image_background">#D1D9E1</color>
+
+    <color name="toolbar_foreground">#3e3e3e</color>
+    <color name="toolbar_background">#ffffff</color>
+
+    <color name="handle_color">#26a69a</color>
+
+    <color name="button_selected_background">#33000000</color>
+    <color name="fontBlack">#000000</color>
+    <color name="fontDarkRed">#990000</color>
+    <color name="fontRed">#FF0000</color>
+    <color name="fontOrange">#FF8000</color>
+    <color name="fontYellow">#FFFF00</color>
+    <color name="fontGreen">#00FF00</color>
+    <color name="fontCyan">#00FFFF</color>
+    <color name="fontLightBlue">#0080FF</color>
+    <color name="fontBlue">#0000FF</color>
+    <color name="fontPurple">#990099</color>
+    <color name="fontPink">#FF00FF</color>
+
+    <integer-array name="fontcolors">
+        <item>@color/fontBlack</item>
+        <item>@color/fontDarkRed</item>
+        <item>@color/fontRed</item>
+        <item>@color/fontOrange</item>
+        <item>@color/fontYellow</item>
+        <item>@color/fontGreen</item>
+        <item>@color/fontCyan</item>
+        <item>@color/fontLightBlue</item>
+        <item>@color/fontBlue</item>
+        <item>@color/fontPurple</item>
+        <item>@color/fontPink</item>
+    </integer-array>
+</resources>
+
diff --git a/android/source/res/values/dimens.xml b/android/source/res/values/dimens.xml
new file mode 100644
index 000000000..ca91a2f30
--- /dev/null
+++ b/android/source/res/values/dimens.xml
@@ -0,0 +1,18 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="text_selection_handle_width">30dp</dimen>
+    <dimen name="text_selection_handle_height">44dp</dimen>
+    <dimen name="text_selection_handle_shadow">2dp</dimen>
+    <dimen name="file_icon_margin_end">8dp</dimen>
+    <dimen name="list_item_margin">8dp</dimen>
+    <dimen name="file_icon_width">32dp</dimen>
+    <dimen name="toolbar_height">256dp</dimen>
+    <dimen name="calc_header_width">48dp</dimen>
+    <dimen name="calc_header_height">24dp</dimen>
+    <dimen name="calc_toolbar_height">40dp</dimen>
+    <dimen name="calc_address_bar_width">96dp</dimen>
+    <dimen name="new_doc_fab_tweak_top">-11dp</dimen>
+    <dimen name="new_doc_fab_tweak_bottom">-7dp</dimen>
+</resources>
diff --git a/android/source/res/values/ids.xml b/android/source/res/values/ids.xml
new file mode 100644
index 000000000..e57595b74
--- /dev/null
+++ b/android/source/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <item name="dummy_id_for_package_name_resolution" type="id"/>
+</resources>
diff --git a/android/source/res/values/integers.xml b/android/source/res/values/integers.xml
new file mode 100644
index 000000000..aeb71c399
--- /dev/null
+++ b/android/source/res/values/integers.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <integer name="grid_view_integer">0</integer>
+
+</resources>
\ No newline at end of file
diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml
new file mode 100644
index 000000000..3669d0a2e
--- /dev/null
+++ b/android/source/res/values/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">LibreOffice Viewer</string>
+    <string name="app_name_settings">LibreOffice Viewer Settings</string>
+
+    <string name="app_about_name"><b>LibreOffice Viewer \'Beta\'</b></string>
+    <string name="app_version">Version: %1$s\nBuild ID: %2$s</string>
+    <string name="app_description">LibreOffice Viewer is a document viewer based on LibreOffice.</string>
+    <string name="app_credits">https://www.libreoffice.org</string>
+    <string name="app_vendor">This release was supplied by $VENDOR.</string>
+    <string name="temp_file_saving_disabled">This file is read-only, saving is disabled.</string>
+
+    <string name="about_license">Show License</string>
+    <string name="about_notice">Show Notice</string>
+    <string name="about_moreinfo">More Info</string>
+    <string name="back_again_to_quit">Press back again to quit</string>
+
+    <string name="new_textdocument">New Text Document</string>
+    <string name="new_presentation">New Presentation</string>
+    <string name="new_spreadsheet">New Spreadsheet</string>
+    <string name="new_drawing">New Drawing</string>
+    <string name="default_document_name">untitled</string>
+
+    <string name="browser_app_name">LibreOffice Browser</string>
+    <string name="menu_search">Search</string>
+    <string name="list_view">List</string>
+    <string name="grid_view">Grid</string>
+    <string name="filter">Filter by</string>
+    <string name="search_not_found">Keyword not found</string>
+    <string name="sort">Sort by</string>
+    <string name="sort_smallest">Smallest first</string>
+    <string name="sort_largest">Largest first</string>
+    <string name="sort_az">A-Z</string>
+    <string name="sort_za">Z-A</string>
+    <string name="sort_oldest">Oldest first</string>
+    <string name="sort_newest">Newest first</string>
+    <string name="menu_sort_size">Sort By Size</string>
+    <string name="menu_sort_az">Sort A-Z</string>
+    <string name="menu_sort_modified">Sort by Date</string>
+    <string name="menu_preferences">Preferences</string>
+    <string name="file_icon_desc">fileicon</string>
+    <string name="title_recents">Recent files</string>
+    <string name="title_browser">All files</string>
+    <!-- Pref keys as resources ; Not currently used -->
+    <string name="EXPLORER_VIEW_TYPE_KEY">EXPLORER_VIEW_TYPE</string>
+    <string name="CURRENT_DIRECTORY_KEY">CURRENT_DIRECTORY</string>
+    <string name="pref_category_explorer">File Explorer Settings</string>
+    <string name="pref_category_general">General</string>
+    <string name="pref_experimental_editing">Experimental Mode</string>
+    <string name="pref_experimental_editing_summary">Enable the experimental editing mode. Use at your own risk.</string>
+    <string name="pref_show_hidden_files">Hidden Files/Folders</string>
+    <string name="pref_show_hidden_files_summary">Enable to show hidden files/folders</string>
+    <string name="pref_developer_mode">Developer Mode</string>
+    <string name="pref_developer_mode_summary">Enable developer mode where you can send UNO commands within app. Use at your own risk.</string>
+
+    <string name="action_about">About</string>
+    <string name="action_parts">Parts</string>
+    <string name="action_settings">Settings</string>
+    <string name="open">Open</string>
+    <string name="share">Share</string>
+    <string name="share_via">Share via</string>
+
+    <!-- Document browser filters -->
+    <string name="filter_everything">Everything</string>
+    <string name="filter_documents">Documents</string>
+    <string name="filter_spreadsheets">Spreadsheets</string>
+    <string name="filter_presentations">Presentations</string>
+    <string name="filter_drawings">Drawings</string>
+
+    <!-- Document provider names -->
+    <string name="document_locations">Document locations</string>
+    <string name="close_document_locations">Close document locations</string>
+    <string name="local_documents">Documents directory</string>
+    <string name="local_file_system">Local file system</string>
+    <string name="external_sd_file_system">External SD</string>
+    <string name="otg_file_system">OTG device (experimental)</string>
+    <string name="owncloud">Remote server</string>
+    <string name="usb_connected_configure">USB connected, configure your device.</string>
+
+    <string name="owncloud_wrong_connection">Cannot connect to ownCloud server. Check your configuration.</string>
+    <string name="owncloud_unauthorized">Cannot log into ownCloud server. Check your configuration.</string>
+    <string name="owncloud_unspecified_error">Unspecified error connecting to ownCloud server. Check your configuration and/or try later.</string>
+
+    <string name="ext_document_provider_error">Invalid root file. Check your sd card configuration.</string>
+    <string name="legacy_extsd_missing_error">Invalid root file. Check your external sd card and/or configuration.</string>
+    <string name="otg_missing_error">Invalid root file. Check your OTG device and/or configuration.</string>
+
+    <!-- Edit action names -->
+    <string name="action_bold">Bold</string>
+    <string name="action_underline">Underline</string>
+    <string name="action_italic">Italic</string>
+    <string name="action_strikeout">Strike Out</string>
+    <string name="action_keyboard">Show keyboard</string>
+    <string name="action_save">Save</string>
+    <string name="action_fromat">Enable Format</string>
+    <string name="action_search">Search</string>
+    <string name="action_UNO_commands">Send UNO Cmd</string>
+
+    <!-- Feedback messages -->
+    <string name="message_saved">Save complete</string>
+    <string name="message_saving">Saving the document…</string>
+    <string name="message_save_incomplete">Save incomplete. Were there any changes?</string>
+    <string name="create_new_file_success">"Created new file - "</string>
+    <string name="create_new_file_error">Unable to create new file, please check entered file name.</string>
+
+    <!-- Document provider settings -->
+    <string name="storage_provider_settings">Storage provider settings</string>
+    <string name="owncloud_settings">ownCloud settings</string>
+    <string name="physical_storage_settings">Physical storage settings</string>
+    <string name="external_sd_path">External SD path</string>
+    <string name="otg_device_path">OTG device path</string>
+    <string name="otg_warning">Experimental Feature: Use only if OTG device is writable.</string>
+    <string name="server_url">Server URL</string>
+    <string name="server_url_and_port">URL and port of the ownCloud server.</string>
+    <string name="user_name">User name</string>
+    <string name="password">Password</string>
+    <string name="action_undo">Undo</string>
+    <string name="action_redo">Redo</string>
+
+    <!-- Directory browser strings -->
+    <string name="up_description">To parent directory</string>
+    <string name="confirm_label">Confirm</string>
+    <string name="cancel_label">Cancel</string>
+    <string name="search_label">Go</string>
+    <string name="directory_browser_label">Choose Directory</string>
+    <string name="bad_directory">Invalid directory path</string>
+    <string name="current_dir">Current Directory: %1$s</string>
+
+    <!-- Save Alert dialog strings -->
+    <string name="save_alert_dialog_title">Save the document before closing?</string>
+    <string name="save_document">SAVE</string>
+    <string name="action_cancel">Cancel</string>
+    <string name="no_save_document">NO</string>
+
+    <!-- Create New Document Dialog Strings -->
+    <string name="create_new_document_title">Enter file name</string>
+    <string name="action_create">CREATE</string>
+
+    <!-- Presentation Mode Strings -->
+    <string name="action_presentation">Slide show</string>
+    <string name="action_add_slide">Add Slide</string>
+    <string name="alert_copy_svg_slide_show_to_clipboard">Your Android device doesn\'t support in-app svg slideshow. We copied the slideshow link to clipboard. Please press home button, open a modern web browser, paste in the address bar, and go.</string>
+    <string name="alert_copy_svg_slide_show_to_clipboard_dismiss">OK</string>
+    <string name="slideshow_action_back">Back</string>
+
+    <!-- Calc Header Menu Strings -->
+    <string name="calc_insert_before">Insert</string>
+    <string name="calc_delete">Delete</string>
+    <string name="calc_hide">Hide</string>
+    <string name="calc_show">Show</string>
+    <string name="calc_optimal_length">Optimal Length</string>
+    <string name="calc_adjust_length">Adjust Length</string>
+    <string name="calc_adjust_height">Adjust Height</string>
+    <string name="calc_adjust_width">Adjust Width</string>
+    <string name="calc_optimal_height">Optimal Height</string>
+    <string name="calc_optimal_width">Optimal Width</string>
+    <string name="calc_optimal_length_confirm">OK</string>
+    <string name="calc_optimal_length_default_text">Enter Extra Length in 100th/mm</string>
+    <string name="calc_alert_double_click_optimal_length">Hint: Double tap on a header sets optimal width/height.</string>
+    <string name="action_add_worksheet">Add Worksheet</string>
+
+    <!-- Password dialog strings -->
+    <string name="action_pwd_dialog_OK">OK</string>
+    <string name="action_pwd_dialog_cancel">Cancel</string>
+    <string name="action_pwd_dialog_title">Please enter password</string>
+
+    <!-- Insert Image Strings -->
+    <string name="take_photo">Take Photo</string>
+    <string name="select_photo">Select Photo</string>
+    <string name="select_photo_title">Select Picture</string>
+    <string name="no_camera_found">No Camera Found</string>
+    <string name="compress_photo_smallest_size">Smallest Size</string>
+    <string name="compress_photo_medium_size">Medium Size</string>
+    <string name="compress_photo_max_quality">Max Quality</string>
+    <string name="compress_photo_no_compress">Don\'t Compress</string>
+    <string name="compress_photo_title">Do you want to compress the photo?</string>
+
+    <!-- Clipboard Actions -->
+    <string name="action_copy">Copy</string>
+    <string name="action_paste">Paste</string>
+    <string name="action_cut">Cut</string>
+    <string name="action_back">Back</string>
+    <string name="action_text_copied">Text copied to the clipboard</string>
+    <string name="insert_table">Insert table</string>
+    <string name="select_insert_options">Select insert options:</string>
+    <string name="select_delete_options">Select delete options:</string>
+    <string name="action_rename_worksheet">Rename worksheet</string>
+    <string name="action_delete_worksheet">Delete worksheet</string>
+    <string name="action_delete_slide">Delete slide</string>
+    <string name="name_already_used">Given name is already being used.</string>
+    <string name="part_name_changed">Part name has been changed.</string>
+    <string name="part_deleted">Part has been deleted.</string>
+    <string-array name="insertrowscolumns">
+        <item>Insert Rows Before</item>
+        <item>Insert Rows After</item>
+        <item>Insert Columns Before</item>
+        <item>Insert Columns After</item>
+        <item>Insert Table</item>
+    </string-array>
+    <string-array name="deleterowcolumns">
+        <item>Delete Rows</item>
+        <item>Delete Columns</item>
+        <item>Delete Table</item>
+    </string-array>
+
+    <!-- UNO cmd controller Strings -->
+    <string name="UNO_commands_string_hint">UNO Command</string>
+    <string name="UNO_commands_string_type_hint">Type</string>
+    <string name="UNO_commands_string_value_hint">Value</string>
+    <string name="UNO_commands_string_parent_value_hint">Parent Value</string>
+    <string name="action_exportToPDF">Export To PDF</string>
+    <string name="action_print">Print</string>
+    <string name="tabhost_character">Character</string>
+    <string name="tabhost_paragraph">Paragraph</string>
+    <string name="tabhost_insert">Insert</string>
+    <string name="tabhost_style">Style</string>
+    <string name="alert_ok">OK</string>
+    <string name="alert_cancel">Cancel</string>
+    <string name="unable_to_go_further">Unable to go further.</string>
+    <string name="current_uno_command">Current UNO command</string>
+    <string name="pref_sort_summary">Select how to order files: A-Z, by size or by date.</string>
+    <string name="pref_viewmode_summary">View files as a grid or in a list.</string>
+    <string name="pref_file_explorer_title">File explorer layout</string>
+    <string name="pref_sort_title">File Order</string>
+    <string name="pref_filter_title">Default File Filter</string>
+    <string name="pref_filter_summary">Set which file filter should be used by default.</string>
+    <string name="display_language">Display Language</string>
+    <string name="display_language_summary">Set the default display language</string>
+    <string name="unable_to_export_pdf">Unable to export to pdf</string>
+    <string name="pdf_exported_at">Exported to PDF at</string>
+    <string name="printing_not_supported">Your device does not support printing</string>
+    <string name="error">Error</string>
+    <string name="enter_part_name">Enter a part name</string>
+    <string name="bmp_null">Bmp is null!</string>
+    <string name="directory_not_saved">Directory not saved.</string>
+    <string name="page">Page</string>
+    <string name="sheet">Sheet</string>
+    <string name="slide">Slide</string>
+    <string name="part">Part</string>
+    <string name="highlight_color">Highlight Color</string>
+    <string name="font_color">Font Color</string>
+    <string name="action_rename_slide">Rename Slide</string>
+</resources>
diff --git a/android/source/res/values/themes.xml b/android/source/res/values/themes.xml
new file mode 100644
index 000000000..8576f9c22
--- /dev/null
+++ b/android/source/res/values/themes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="LibreOfficeTheme" parent="LibreOfficeTheme.Base"/>
+
+    <style name="LibreOfficeTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
+    </style>
+
+    <style name="ListItemText">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textColor">@android:color/black</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="LibreOfficeTheme.Toolbar" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/toolbar_background</item>
+    </style>
+
+    <style name="LibreOfficeTheme.NavigationView">
+        <item name="colorPrimary">@android:color/black</item>
+    </style>
+
+    <style name="NewDocumentTextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:elevation" tools:ignore="NewApi">2dp</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:typeface">normal</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:background">@drawable/label_background</item>
+    </style>
+</resources>
diff --git a/android/source/res/xml/documentprovider_preferences.xml b/android/source/res/xml/documentprovider_preferences.xml
new file mode 100644
index 000000000..bb5f087dd
--- /dev/null
+++ b/android/source/res/xml/documentprovider_preferences.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file is part of the LibreOffice project.
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/owncloud_settings"
+        android:key="pref_key_owncloud_settings">
+        <EditTextPreference
+            android:key="pref_server_url"
+            android:title="@string/server_url"
+            android:summary="@string/server_url_and_port"
+            android:hint="https://server:port/" />
+        <EditTextPreference
+            android:key="pref_user_name"
+            android:title="@string/user_name" />
+        <EditTextPreference
+            android:key="pref_password"
+            android:title="@string/password"
+            android:password="true" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/physical_storage_settings">
+        <PreferenceScreen
+            android:title="@string/external_sd_path"
+            android:key="pref_extsd_path_uri">
+        </PreferenceScreen>
+        <PreferenceScreen
+            android:title="@string/otg_device_path"
+            android:key="pref_otg_path_uri"
+            android:summary="@string/otg_warning">
+        </PreferenceScreen>
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/android/source/res/xml/file_paths.xml b/android/source/res/xml/file_paths.xml
new file mode 100644
index 000000000..2bbe2aef1
--- /dev/null
+++ b/android/source/res/xml/file_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path name="LO_files_universal" path="Android/" />
+</paths>
\ No newline at end of file
diff --git a/android/source/res/xml/libreoffice_preferences.xml b/android/source/res/xml/libreoffice_preferences.xml
new file mode 100644
index 000000000..d418dd559
--- /dev/null
+++ b/android/source/res/xml/libreoffice_preferences.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+    <PreferenceCategory
+        android:title="@string/pref_category_explorer"
+        android:key="PREF_CATEGORY_EXPLORER">
+        <ListPreference
+            android:title="@string/pref_filter_title"
+            android:summary="@string/pref_filter_summary"
+            android:entries="@array/FilterTypeNames"
+            android:entryValues="@array/FilterTypeStringValues"
+            android:defaultValue="-1"
+            android:key="FILTER_MODE"/>
+        <ListPreference
+            android:summary="@string/pref_sort_summary"
+            android:key="SORT_MODE"
+            android:title="@string/pref_sort_title"
+            android:entries="@array/SortModeNames"
+            android:defaultValue="0"
+            android:entryValues="@array/SortModeStringValues"/>
+        <ListPreference
+            android:entries="@array/ViewModeNames"
+            android:entryValues="@array/ViewModeStringValues"
+            android:defaultValue="@integer/grid_view_integer"
+            android:title="@string/pref_file_explorer_title"
+            android:key="EXPLORER_VIEW_TYPE"
+            android:summary="@string/pref_viewmode_summary" />
+
+        <CheckBoxPreference
+            android:title="@string/pref_show_hidden_files"
+            android:key="ENABLE_SHOW_HIDDEN_FILES"
+            android:summary="@string/pref_show_hidden_files_summary"
+            android:defaultValue="false" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/pref_category_general"
+        android:key="PREF_CATEGORY_GENERAL">
+
+        <ListPreference
+            android:title="@string/display_language"
+            android:summary="@string/display_language_summary"
+            android:entries="@array/SupportedLanguages"
+            android:entryValues="@array/SupportedLanguagesValues"
+            android:defaultValue="SYSTEM_DEFAULT_LANGUAGE"
+            android:key="DISPLAY_LANGUAGE"
+            />
+
+        <CheckBoxPreference
+            android:title="@string/pref_experimental_editing"
+            android:key="ENABLE_EXPERIMENTAL"
+            android:summary="@string/pref_experimental_editing_summary"
+            android:defaultValue="false" />
+        <CheckBoxPreference
+            android:title="@string/pref_developer_mode"
+            android:key="ENABLE_DEVELOPER"
+            android:dependency="ENABLE_EXPERIMENTAL"
+            android:summary="@string/pref_developer_mode_summary"
+            android:defaultValue="false" />
+    </PreferenceCategory>
+</PreferenceScreen>
-- 
cgit v1.2.3