From 657e0460fe7e282756f034380f3d187dbfe8d1fe Mon Sep 17 00:00:00 2001
From: Scott Warner <Tortel1210@gmail.com>
Date: Wed, 24 Jun 2020 15:08:01 -0400
Subject: [PATCH] Messaging: Use a DayNight launch theme

This prevents the white launch screen from appearing when the system theme
is dark

Change-Id: I861f9e5a58b4bb52385c75459fc4de73532d15a8
---
 AndroidManifest.xml                                          | 2 +-
 res/values/styles.xml                                        | 5 +++++
 .../ui/conversationlist/ConversationListActivity.java        | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0bdbbbb..3c7b4db 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -73,7 +73,7 @@
             android:screenOrientation="user"
             android:label="@string/app_name"
             android:exported="true"
-            android:theme="@style/BugleTheme.ConversationListActivity">
+            android:theme="@style/LaunchTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5a70a6f..8a6c691 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -40,6 +40,11 @@
          <item name="apnPreferenceStyle">@style/ApnPreference</item>
     </style>
 
+    <style name="LaunchTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+         <item name="colorPrimary">@color/action_bar_background_color</item>
+         <item name="colorPrimaryDark">@color/action_bar_background_color_dark</item>
+    </style>
+
     <style name="BugleTheme.ConversationActivity"
         parent="@style/BugleTheme.ConversationActivityBase">
     </style>
diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java
index 636b0f5..4d83f12 100644
--- a/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java
+++ b/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java
@@ -31,6 +31,7 @@ public class ConversationListActivity extends AbstractConversationListActivity {
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         Trace.beginSection("ConversationListActivity.onCreate");
+        setTheme(R.style.BugleTheme_ConversationListActivity);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.conversation_list_activity);
         Trace.endSection();