[Libreoffice-commits] core.git: 2 commits - android/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.com
Sun Nov 1 23:49:11 PST 2015
android/source/res/drawable-hdpi/handle_alias_end.xml | 5
android/source/res/drawable-hdpi/handle_alias_middle.xml | 5
android/source/res/drawable-hdpi/handle_alias_start.xml | 5
android/source/res/drawable-hdpi/handle_image_end.png |binary
android/source/res/drawable-hdpi/handle_image_middle.png |binary
android/source/res/drawable-hdpi/handle_image_start.png |binary
android/source/res/drawable-xhdpi/handle_image_end.png |binary
android/source/res/drawable-xhdpi/handle_image_middle.png |binary
android/source/res/drawable-xhdpi/handle_image_start.png |binary
android/source/res/drawable/handle_end_level.xml | 14
android/source/res/drawable/handle_image_end.png |binary
android/source/res/drawable/handle_image_middle.png |binary
android/source/res/drawable/handle_image_start.png |binary
android/source/res/drawable/handle_start_level.xml | 14
android/source/res/values/colors.xml | 177 +++++-----
android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java | 2
android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java | 2
android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java | 2
dev/null |binary
19 files changed, 108 insertions(+), 118 deletions(-)
New commits:
commit 74463457b39c9def1add630b7b0581dc195549c8
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Sun Nov 1 23:28:43 2015 +0100
android: chanhe handles to use alias, tint handles with color
Change-Id: I86ad5eefd70bc8b768780cac66ca466aa0926dc4
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 0000000..8319861
--- /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 0000000..a8587f6
--- /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 0000000..df10470
--- /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
similarity index 100%
rename from android/source/res/drawable-hdpi/handle_end.png
rename to android/source/res/drawable-hdpi/handle_image_end.png
diff --git a/android/source/res/drawable-hdpi/handle_middle.png b/android/source/res/drawable-hdpi/handle_image_middle.png
similarity index 100%
rename from android/source/res/drawable-hdpi/handle_middle.png
rename to android/source/res/drawable-hdpi/handle_image_middle.png
diff --git a/android/source/res/drawable-hdpi/handle_start.png b/android/source/res/drawable-hdpi/handle_image_start.png
similarity index 100%
rename from android/source/res/drawable-hdpi/handle_start.png
rename to android/source/res/drawable-hdpi/handle_image_start.png
diff --git a/android/source/res/drawable-xhdpi/handle_end.png b/android/source/res/drawable-xhdpi/handle_image_end.png
similarity index 100%
rename from android/source/res/drawable-xhdpi/handle_end.png
rename to android/source/res/drawable-xhdpi/handle_image_end.png
diff --git a/android/source/res/drawable-xhdpi/handle_middle.png b/android/source/res/drawable-xhdpi/handle_image_middle.png
similarity index 100%
rename from android/source/res/drawable-xhdpi/handle_middle.png
rename to android/source/res/drawable-xhdpi/handle_image_middle.png
diff --git a/android/source/res/drawable-xhdpi/handle_start.png b/android/source/res/drawable-xhdpi/handle_image_start.png
similarity index 100%
rename from android/source/res/drawable-xhdpi/handle_start.png
rename to android/source/res/drawable-xhdpi/handle_image_start.png
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 40a512b..0000000
--- 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
similarity index 100%
rename from android/source/res/drawable/handle_end.png
rename to android/source/res/drawable/handle_image_end.png
diff --git a/android/source/res/drawable/handle_middle.png b/android/source/res/drawable/handle_image_middle.png
similarity index 100%
rename from android/source/res/drawable/handle_middle.png
rename to android/source/res/drawable/handle_image_middle.png
diff --git a/android/source/res/drawable/handle_start.png b/android/source/res/drawable/handle_image_start.png
similarity index 100%
rename from android/source/res/drawable/handle_start.png
rename to android/source/res/drawable/handle_image_start.png
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 2294513..0000000
--- 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 6321906..3e1cd21 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 7d4d635..f0b68ee 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 b7f6e26..409c3f2 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 ac6e089..66b109f 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));
}
/**
commit d38abe1da2a42bc20a986d43f96142e15c1b3bef
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Sun Nov 1 23:17:52 2015 +0100
andorid: use 4 spaces for indent in color.xml
Change-Id: I2435e8ce93383a1a40996a81ef65c1823606609a
diff --git a/android/source/res/values/colors.xml b/android/source/res/values/colors.xml
index f8e207d..6321906 100644
--- a/android/source/res/values/colors.xml
+++ b/android/source/res/values/colors.xml
@@ -4,92 +4,92 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<resources>
- <color name="background_light">#FFECF0F3</color>
- <color name="background_normal">#FFCED7DE</color>
- <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="background_light">#FFECF0F3</color>
+ <color name="background_normal">#FFCED7DE</color>
+ <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>
</resources>
More information about the Libreoffice-commits
mailing list