summaryrefslogtreecommitdiff
path: root/android/source
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-01 23:28:43 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-02 08:48:47 +0100
commit74463457b39c9def1add630b7b0581dc195549c8 (patch)
treea1f528a43c8582bd47a58da858b6d4cbc284c86f /android/source
parentd38abe1da2a42bc20a986d43f96142e15c1b3bef (diff)
android: chanhe handles to use alias, tint handles with color
Change-Id: I86ad5eefd70bc8b768780cac66ca466aa0926dc4
Diffstat (limited to 'android/source')
-rw-r--r--android/source/res/drawable-hdpi/handle_alias_end.xml5
-rw-r--r--android/source/res/drawable-hdpi/handle_alias_middle.xml5
-rw-r--r--android/source/res/drawable-hdpi/handle_alias_start.xml5
-rw-r--r--android/source/res/drawable-hdpi/handle_image_end.png (renamed from android/source/res/drawable-hdpi/handle_end.png)bin2356 -> 2356 bytes
-rw-r--r--android/source/res/drawable-hdpi/handle_image_middle.png (renamed from android/source/res/drawable-hdpi/handle_middle.png)bin2499 -> 2499 bytes
-rw-r--r--android/source/res/drawable-hdpi/handle_image_start.png (renamed from android/source/res/drawable-hdpi/handle_start.png)bin2303 -> 2303 bytes
-rw-r--r--android/source/res/drawable-xhdpi/handle_image_end.png (renamed from android/source/res/drawable-xhdpi/handle_end.png)bin2770 -> 2770 bytes
-rw-r--r--android/source/res/drawable-xhdpi/handle_image_middle.png (renamed from android/source/res/drawable-xhdpi/handle_middle.png)bin2849 -> 2849 bytes
-rw-r--r--android/source/res/drawable-xhdpi/handle_image_start.png (renamed from android/source/res/drawable-xhdpi/handle_start.png)bin2702 -> 2702 bytes
-rw-r--r--android/source/res/drawable/handle_end_level.xml14
-rw-r--r--android/source/res/drawable/handle_image_end.png (renamed from android/source/res/drawable/handle_end.png)bin1734 -> 1734 bytes
-rw-r--r--android/source/res/drawable/handle_image_middle.png (renamed from android/source/res/drawable/handle_middle.png)bin1850 -> 1850 bytes
-rw-r--r--android/source/res/drawable/handle_image_start.png (renamed from android/source/res/drawable/handle_start.png)bin1676 -> 1676 bytes
-rw-r--r--android/source/res/drawable/handle_start_level.xml14
-rw-r--r--android/source/res/values/colors.xml3
-rw-r--r--android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java2
-rw-r--r--android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java2
-rw-r--r--android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java2
18 files changed, 21 insertions, 31 deletions
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 000000000000..83198618afea
--- /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 000000000000..a8587f66dab4
--- /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 000000000000..df104709f3c2
--- /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/handle_end.png b/android/source/res/drawable-hdpi/handle_image_end.png
index d5e204429ef3..d5e204429ef3 100644
--- a/android/source/res/drawable-hdpi/handle_end.png
+++ b/android/source/res/drawable-hdpi/handle_image_end.png
Binary files differ
diff --git a/android/source/res/drawable-hdpi/handle_middle.png b/android/source/res/drawable-hdpi/handle_image_middle.png
index f5dab66a978d..f5dab66a978d 100644
--- a/android/source/res/drawable-hdpi/handle_middle.png
+++ b/android/source/res/drawable-hdpi/handle_image_middle.png
Binary files differ
diff --git a/android/source/res/drawable-hdpi/handle_start.png b/android/source/res/drawable-hdpi/handle_image_start.png
index b6a8ce79e942..b6a8ce79e942 100644
--- a/android/source/res/drawable-hdpi/handle_start.png
+++ b/android/source/res/drawable-hdpi/handle_image_start.png
Binary files differ
diff --git a/android/source/res/drawable-xhdpi/handle_end.png b/android/source/res/drawable-xhdpi/handle_image_end.png
index 02e51737fef1..02e51737fef1 100644
--- a/android/source/res/drawable-xhdpi/handle_end.png
+++ b/android/source/res/drawable-xhdpi/handle_image_end.png
Binary files differ
diff --git a/android/source/res/drawable-xhdpi/handle_middle.png b/android/source/res/drawable-xhdpi/handle_image_middle.png
index 15940a2cc85a..15940a2cc85a 100644
--- a/android/source/res/drawable-xhdpi/handle_middle.png
+++ b/android/source/res/drawable-xhdpi/handle_image_middle.png
Binary files differ
diff --git a/android/source/res/drawable-xhdpi/handle_start.png b/android/source/res/drawable-xhdpi/handle_image_start.png
index 9af76544812c..9af76544812c 100644
--- a/android/source/res/drawable-xhdpi/handle_start.png
+++ b/android/source/res/drawable-xhdpi/handle_image_start.png
Binary files differ
diff --git a/android/source/res/drawable/handle_end_level.xml b/android/source/res/drawable/handle_end_level.xml
deleted file mode 100644
index 40a512b3800a..000000000000
--- a/android/source/res/drawable/handle_end_level.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/. -->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-
- <!-- LTR -->
- <item android:maxLevel="0" android:drawable="@drawable/handle_end"/>
-
- <!-- RTL -->
- <item android:maxLevel="1" android:drawable="@drawable/handle_start"/>
-
-</level-list>
diff --git a/android/source/res/drawable/handle_end.png b/android/source/res/drawable/handle_image_end.png
index 32b77dfa6e26..32b77dfa6e26 100644
--- a/android/source/res/drawable/handle_end.png
+++ b/android/source/res/drawable/handle_image_end.png
Binary files differ
diff --git a/android/source/res/drawable/handle_middle.png b/android/source/res/drawable/handle_image_middle.png
index 751eb898b136..751eb898b136 100644
--- a/android/source/res/drawable/handle_middle.png
+++ b/android/source/res/drawable/handle_image_middle.png
Binary files differ
diff --git a/android/source/res/drawable/handle_start.png b/android/source/res/drawable/handle_image_start.png
index cf12a0dcdcf3..cf12a0dcdcf3 100644
--- a/android/source/res/drawable/handle_start.png
+++ b/android/source/res/drawable/handle_image_start.png
Binary files differ
diff --git a/android/source/res/drawable/handle_start_level.xml b/android/source/res/drawable/handle_start_level.xml
deleted file mode 100644
index 22945138d765..000000000000
--- a/android/source/res/drawable/handle_start_level.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/. -->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-
- <!-- LTR -->
- <item android:maxLevel="0" android:drawable="@drawable/handle_start"/>
-
- <!-- RTL -->
- <item android:maxLevel="1" android:drawable="@drawable/handle_end"/>
-
-</level-list>
diff --git a/android/source/res/values/colors.xml b/android/source/res/values/colors.xml
index 63219068f142..3e1cd2125e5d 100644
--- a/android/source/res/values/colors.xml
+++ b/android/source/res/values/colors.xml
@@ -91,5 +91,8 @@
<color name="home_last_tab_bar_bg">#FFF5F7F9</color>
<color name="panel_grid_item_image_background">#D1D9E1</color>
+
+ <color name="handle_color">#40A040</color>
+
</resources>
diff --git a/android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java b/android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java
index 7d4d63520035..f0b68eea2f10 100644
--- a/android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java
+++ b/android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java
@@ -9,7 +9,7 @@ import org.libreoffice.R;
*/
public class SelectionHandleEnd extends SelectionHandle {
public SelectionHandleEnd(Context context) {
- super(getBitmapForDrawable(context, R.drawable.handle_end));
+ super(getBitmapForDrawable(context, R.drawable.handle_alias_end));
}
/**
diff --git a/android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java b/android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java
index b7f6e26d1929..409c3f222da5 100644
--- a/android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java
+++ b/android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java
@@ -9,7 +9,7 @@ import org.libreoffice.R;
*/
public class SelectionHandleMiddle extends SelectionHandle {
public SelectionHandleMiddle(Context context) {
- super(getBitmapForDrawable(context, R.drawable.handle_middle));
+ super(getBitmapForDrawable(context, R.drawable.handle_alias_middle));
}
/**
diff --git a/android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java b/android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java
index ac6e08922d78..66b109f86e13 100644
--- a/android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java
+++ b/android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java
@@ -9,7 +9,7 @@ import org.libreoffice.R;
*/
public class SelectionHandleStart extends SelectionHandle {
public SelectionHandleStart(Context context) {
- super(getBitmapForDrawable(context, R.drawable.handle_start));
+ super(getBitmapForDrawable(context, R.drawable.handle_alias_start));
}
/**