From 8afdbc1f4d2ac51d1ea740852add2d0651c60b28 Mon Sep 17 00:00:00 2001
From: Geonu Kang <blamethegnu@unrulygnu.com>
Date: Fri, 20 Nov 2015 18:54:10 +0900
Subject: [PATCH] Fix NewConversationActivity toolbar/overflow dynamic theming

Fixes #4624
Closes #4626
---
 res/layout/contact_selection_activity.xml | 2 +-
 res/values/styles.xml                     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/layout/contact_selection_activity.xml b/res/layout/contact_selection_activity.xml
index 643c49a612..26030dda90 100644
--- a/res/layout/contact_selection_activity.xml
+++ b/res/layout/contact_selection_activity.xml
@@ -11,7 +11,7 @@
             android:layout_width="match_parent"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:theme="@style/TextSecure.LightActionBar" />
+            android:theme="?attr/actionBarStyle" />
 
         <fragment android:id="@+id/contact_selection_list_fragment"
                   android:layout_width="match_parent"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bc35a2942e..7af8a3aa68 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,7 +31,6 @@
         <item name="android:icon">@drawable/actionbar_icon_holo_dark</item>
         <item name="icon">@drawable/actionbar_icon_holo_dark</item>
         <item name="background">@color/gray95</item>
-        <item name="android:background">@color/gray95</item>
         <item name="logo">@drawable/actionbar_icon_holo_dark</item>
         <item name="android:popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>