android: Add bottom formatting toolbar

Desktop / LibreOffice - Tomaž Vajngerl [collabora.com] - 13 November 2015 04:40 UTC

The bottom formatting toolbar now shows the formatting options previously located in the main toolbar as a menu entry (bold, italic, ...). In addition alignment options and selection of fonts and sizes have been added.

Bottom formatting toolbar is not shown by default - it enables when hitting the icon in main toolbar. Also soft keyboard and formatting toolbar should not be shown at the same time.

319623a android: Add bottom formatting toolbar
.../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-xxxhdpi/ic_check_black_24dp.png | Bin 0 -> 277 bytes
.../res/drawable-xxxhdpi/ic_check_grey600_24dp.png | Bin 433 -> 0 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_keyboard_grey600_24dp.png | Bin 1831 -> 0 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_menu_grey600_24dp.png | Bin 203 -> 0 bytes
.../drawable-xxxhdpi/ic_text_format_black_24dp.png | Bin 0 -> 641 bytes
.../drawable-xxxhdpi/image_button_background.xml | 6 +
android/source/res/drawable/ic_check.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/layout/activity_main.xml | 12 +-
android/source/res/layout/toolbar_bottom.xml | 136 +++++++++++++
android/source/res/menu/main.xml | 31 +--
android/source/res/values/colors.xml | 3 +-
android/source/res/values/strings.xml | 1 +
.../src/java/org/libreoffice/FontController.java | 203 ++++++++++++++++++++
.../java/org/libreoffice/FormattingController.java | 145 ++++++++++++++
.../java/org/libreoffice/InvalidationHandler.java | 26 ++-
.../src/java/org/libreoffice/LOKitShell.java | 8 +
.../java/org/libreoffice/LOKitTileProvider.java | 11 ++
.../org/libreoffice/LibreOfficeMainActivity.java | 202 +++++++++++--------
.../java/org/libreoffice/ToolbarController.java | 125 ++++++------
.../java/org/libreoffice/canvas/BitmapHandle.java | 6 +-
.../java/org/libreoffice/canvas/ImageUtils.java | 37 ++--
42 files changed, 819 insertions(+), 193 deletions(-)

Upstream: cgit.freedesktop.org

  • Share