summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-11-10 12:40:21 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-11-10 15:01:03 +0100
commit7cde8def9384fc09e6a539cd142dafc10aa88b61 (patch)
treebf68ba69ba3495e4f40c61e59e4a51db156f8c0b
parentResolves: tdf#103815 Revert "use same GtkInstance::AnyInput impl" (diff)
downloadcore-7cde8def9384fc09e6a539cd142dafc10aa88b61.tar.gz
core-7cde8def9384fc09e6a539cd142dafc10aa88b61.zip
re-apply "use material style selection handles""
and account for the libreofficekit changes This reverts commit 50e9065cbbb2c62fa925cf5b561a85c715a0eb1e. that did in turn revert 4ae8c3c20bd4a10ba141a32f01e23ac63636f9c3. Change-Id: Ie02d8743b3608120ed63bfe2a014fa4139577b01
-rw-r--r--android/source/res/drawable-hdpi/handle_image_end.pngbin2356 -> 0 bytes
-rw-r--r--android/source/res/drawable-hdpi/handle_image_middle.pngbin2499 -> 0 bytes
-rw-r--r--android/source/res/drawable-hdpi/handle_image_start.pngbin2303 -> 0 bytes
-rw-r--r--android/source/res/drawable-xhdpi/handle_image_end.pngbin2770 -> 413 bytes
-rw-r--r--android/source/res/drawable-xhdpi/handle_image_middle.pngbin2849 -> 615 bytes
-rw-r--r--android/source/res/drawable-xhdpi/handle_image_start.pngbin2702 -> 422 bytes
-rw-r--r--android/source/res/drawable/handle_image_end.pngbin1734 -> 0 bytes
-rw-r--r--android/source/res/drawable/handle_image_middle.pngbin1850 -> 0 bytes
-rw-r--r--android/source/res/drawable/handle_image_start.pngbin1676 -> 0 bytes
-rw-r--r--libreofficekit/Package_selectionhandles.mk2
10 files changed, 1 insertions, 1 deletions
diff --git a/android/source/res/drawable-hdpi/handle_image_end.png b/android/source/res/drawable-hdpi/handle_image_end.png
deleted file mode 100644
index d5e204429ef3..000000000000
--- a/android/source/res/drawable-hdpi/handle_image_end.png
+++ /dev/null
Binary files differ
diff --git a/android/source/res/drawable-hdpi/handle_image_middle.png b/android/source/res/drawable-hdpi/handle_image_middle.png
deleted file mode 100644
index f5dab66a978d..000000000000
--- a/android/source/res/drawable-hdpi/handle_image_middle.png
+++ /dev/null
Binary files differ
diff --git a/android/source/res/drawable-hdpi/handle_image_start.png b/android/source/res/drawable-hdpi/handle_image_start.png
deleted file mode 100644
index b6a8ce79e942..000000000000
--- a/android/source/res/drawable-hdpi/handle_image_start.png
+++ /dev/null
Binary files differ
diff --git a/android/source/res/drawable-xhdpi/handle_image_end.png b/android/source/res/drawable-xhdpi/handle_image_end.png
index 02e51737fef1..b6e943bc0b17 100644
--- a/android/source/res/drawable-xhdpi/handle_image_end.png
+++ b/android/source/res/drawable-xhdpi/handle_image_end.png
Binary files differ
diff --git a/android/source/res/drawable-xhdpi/handle_image_middle.png b/android/source/res/drawable-xhdpi/handle_image_middle.png
index 15940a2cc85a..4d28b4ab4303 100644
--- a/android/source/res/drawable-xhdpi/handle_image_middle.png
+++ b/android/source/res/drawable-xhdpi/handle_image_middle.png
Binary files differ
diff --git a/android/source/res/drawable-xhdpi/handle_image_start.png b/android/source/res/drawable-xhdpi/handle_image_start.png
index 9af76544812c..3bd7a4cb3c4d 100644
--- a/android/source/res/drawable-xhdpi/handle_image_start.png
+++ b/android/source/res/drawable-xhdpi/handle_image_start.png
Binary files differ
diff --git a/android/source/res/drawable/handle_image_end.png b/android/source/res/drawable/handle_image_end.png
deleted file mode 100644
index 32b77dfa6e26..000000000000
--- a/android/source/res/drawable/handle_image_end.png
+++ /dev/null
Binary files differ
diff --git a/android/source/res/drawable/handle_image_middle.png b/android/source/res/drawable/handle_image_middle.png
deleted file mode 100644
index 751eb898b136..000000000000
--- a/android/source/res/drawable/handle_image_middle.png
+++ /dev/null
Binary files differ
diff --git a/android/source/res/drawable/handle_image_start.png b/android/source/res/drawable/handle_image_start.png
deleted file mode 100644
index cf12a0dcdcf3..000000000000
--- a/android/source/res/drawable/handle_image_start.png
+++ /dev/null
Binary files differ
diff --git a/libreofficekit/Package_selectionhandles.mk b/libreofficekit/Package_selectionhandles.mk
index 77c70b4e6352..106a1059d943 100644
--- a/libreofficekit/Package_selectionhandles.mk
+++ b/libreofficekit/Package_selectionhandles.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,libreofficekit_selectionhandles,$(SRCDIR)/android/source/res/drawable))
+$(eval $(call gb_Package_Package,libreofficekit_selectionhandles,$(SRCDIR)/android/source/res/drawable-xhdpi))
$(eval $(call gb_Package_add_files,libreofficekit_selectionhandles,$(LIBO_SHARE_FOLDER)/libreofficekit,\
handle_image_start.png \