From 6a090bd5f1d78ee1cf144a93644f4ddb93a5ab83 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 20 Jul 2018 16:37:34 -0700
Subject: [PATCH] Some visual tweak fixes.

- Use correct color action bar in contact name edit activity.
- Fix compose text height to match send button height.
---
 res/layout/activity_contact_name_edit.xml | 5 +++--
 res/layout/conversation_input_panel.xml   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/layout/activity_contact_name_edit.xml b/res/layout/activity_contact_name_edit.xml
index 1a4ad06c35..feb354872c 100644
--- a/res/layout/activity_contact_name_edit.xml
+++ b/res/layout/activity_contact_name_edit.xml
@@ -11,8 +11,9 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:theme="@style/TextSecure.LightActionBar"
-        android:background="@color/signal_primary"
+        android:theme="?attr/actionBarStyle"
+        android:minHeight="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
         android:elevation="4dp"/>
 
     <ScrollView
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index c06879dc34..408521eaea 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -76,8 +76,8 @@
                         android:layout_marginStart="6dp"
                         android:layout_marginRight="6dp"
                         android:layout_marginEnd="6dp"
-                        android:layout_marginTop="9dp"
-                        android:layout_marginBottom="9dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:nextFocusForward="@+id/send_button"