From d040be2df0fc551f5bca92f09e5fabaf20c6da63 Mon Sep 17 00:00:00 2001
From: Fumiaki Yoshimatsu <fumiakiy@gmail.com>
Date: Mon, 31 Aug 2020 23:55:46 -0400
Subject: [PATCH] Use the light styles in the action bar style in the light
 theme, but keep the dark theme version of it in the action mode.

Fixes #9932
---
 app/src/main/res/values/styles.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7ecc36a61..b2be0b79b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,8 +60,8 @@
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
         <item name="elevation">0dp</item>
-        <item name="actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
-        <item name="android:actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
+        <item name="actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow.Light</item>
+        <item name="android:actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow.Light</item>
     </style>
 
     <style name="TextSecure.LightActionBar.DarkText"
@@ -363,6 +363,14 @@
 
     <style name="TextSecure.ActionModeStyle" parent="@style/Widget.AppCompat.ActionMode">
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle.Conversation</item>
+        <item name="theme">@style/Signal.ActionModeTheme</item>
+    </style>
+
+    <style name="Signal.ActionModeTheme" parent="ThemeOverlay.AppCompat">
+        <!-- Use the brighter version of the three dot button because
+             ActionMode background is darker regardless of the current theme (light or dark) -->
+        <item name="actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
+        <item name="android:actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
     </style>
 
     <style name="Widget.Signal.ArcProgressBar" parent="">