From 633aa9b0573e68cbb1fc44cb90d0bedfe7449b8e Mon Sep 17 00:00:00 2001
From: Veeti Paananen <veeti.paananen@rojekti.fi>
Date: Mon, 24 Feb 2014 23:34:29 +0200
Subject: [PATCH] Fix the send button's touch highlight color

Introduce a generic touch highlight background drawable, and use the
proper shades of blue (and gray on v19+).
---
 res/drawable/send_button_background.xml     | 24 ---------------------
 res/drawable/touch_highlight_background.xml |  5 +++++
 res/layout/conversation_activity.xml        |  2 +-
 res/values-v19/colors.xml                   |  1 +
 res/values/colors.xml                       |  1 +
 5 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 res/drawable/send_button_background.xml
 create mode 100644 res/drawable/touch_highlight_background.xml

diff --git a/res/drawable/send_button_background.xml b/res/drawable/send_button_background.xml
deleted file mode 100644
index 5d1fcdbe9..000000000
--- a/res/drawable/send_button_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- pressed -->
-    <item android:state_pressed="true" >
-        <shape>
-            <solid android:color="#FF33B5E5" />
-        </shape>
-    </item>
-
-    <!-- focused -->
-    <item android:state_focused="true" >
-        <shape>
-            <solid android:color="#FF33B5E5" />
-        </shape>
-    </item>
-
-    <!-- default -->
-    <item>
-        <shape>
-            <solid android:color="#00ffffff" />
-        </shape>
-    </item>
-
-</selector>
\ No newline at end of file
diff --git a/res/drawable/touch_highlight_background.xml b/res/drawable/touch_highlight_background.xml
new file mode 100644
index 000000000..de376e0b1
--- /dev/null
+++ b/res/drawable/touch_highlight_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/touch_highlight" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 9a70f0668..584e7224e 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -108,7 +108,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
                     android:layout_gravity="center_vertical"
-                    android:background="@drawable/send_button_background"
+                    android:background="@drawable/touch_highlight_background"
                     android:contentDescription="@string/conversation_activity__send"
                     android:nextFocusLeft="@+id/embedded_text_editor"
                     android:padding="12dp"
diff --git a/res/values-v19/colors.xml b/res/values-v19/colors.xml
index 1940f49f7..c9b0564e4 100644
--- a/res/values-v19/colors.xml
+++ b/res/values-v19/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="touch_highlight">#10000000</color>
     <color name="card_background_active">#99bebebe</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b92d49e8b..130f374bd 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -11,6 +11,7 @@
 
     <color name="textsecure_holo_blue_light">#ff33b5e5</color>
 
+    <color name="touch_highlight">#400099cc</color>
     <color name="card_background_active">#9933b5e5</color>
 
     <color name="conversation_item_sent_background_dark">#ff284e0a</color>