From 44b42747f46972d043b76b8d49ffd478c709c65e Mon Sep 17 00:00:00 2001
From: Philip Whitehouse <philip@whiuk.com>
Date: Thu, 2 Mar 2017 23:36:57 +0000
Subject: [PATCH 1/2] Display subject correctly in expanded notifications

---
 k9mail/src/main/res/values-v21/styles.xml | 2 +-
 k9mail/src/main/res/values/styles.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/k9mail/src/main/res/values-v21/styles.xml b/k9mail/src/main/res/values-v21/styles.xml
index 2411d8049..d3d90657f 100644
--- a/k9mail/src/main/res/values-v21/styles.xml
+++ b/k9mail/src/main/res/values-v21/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="TextAppearance.StatusBar.EventContent.Emphasized" parent="@android:style/TextAppearance.StatusBar.EventContent">
-        <item name="android:textColor">?android:textColorPrimaryInverse</item>
+        <item name="android:textSize">16sp</item>
     </style>
 </resources>
diff --git a/k9mail/src/main/res/values/styles.xml b/k9mail/src/main/res/values/styles.xml
index 4f8ad99a9..8fd3127d1 100644
--- a/k9mail/src/main/res/values/styles.xml
+++ b/k9mail/src/main/res/values/styles.xml
@@ -19,7 +19,7 @@
     </style>
 
     <style name="TextAppearance.StatusBar.EventContent.Emphasized" parent="@android:style/TextAppearance.StatusBar.EventContent">
-        <item name="android:textColor">#cccccc</item>
+        <item name="android:textSize">16sp</item>
     </style>
 
     <style name="UnreadWidgetContainer">

From 4eb431b170923cb631df1610318e2a66e77cd78f Mon Sep 17 00:00:00 2001
From: Philip Whitehouse <philip@whiuk.com>
Date: Fri, 17 Mar 2017 13:43:58 +0000
Subject: [PATCH 2/2] Remove emphasised span entirely

---
 .../NotificationContentCreator.java            | 18 +-----------------
 k9mail/src/main/res/values-v21/styles.xml      |  6 ------
 k9mail/src/main/res/values/styles.xml          |  4 ----
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 k9mail/src/main/res/values-v21/styles.xml

diff --git a/k9mail/src/main/java/com/fsck/k9/notification/NotificationContentCreator.java b/k9mail/src/main/java/com/fsck/k9/notification/NotificationContentCreator.java
index 0c1251b8e..ec878934b 100644
--- a/k9mail/src/main/java/com/fsck/k9/notification/NotificationContentCreator.java
+++ b/k9mail/src/main/java/com/fsck/k9/notification/NotificationContentCreator.java
@@ -4,8 +4,6 @@ package com.fsck.k9.notification;
 import android.content.Context;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import android.text.style.TextAppearanceSpan;
-import timber.log.Timber;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
@@ -16,14 +14,12 @@ import com.fsck.k9.helper.MessageHelper;
 import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.Message;
-import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mailstore.LocalMessage;
 import com.fsck.k9.message.extractors.PreviewResult.PreviewType;
 
 
 class NotificationContentCreator {
     private final Context context;
-    private TextAppearanceSpan emphasizedSpan;
 
 
     public NotificationContentCreator(Context context) {
@@ -60,9 +56,7 @@ class NotificationContentCreator {
             preview.append('\n');
             preview.append(snippet);
         }
-
-        preview.setSpan(getEmphasizedSpan(), 0, displaySubject.length(), 0);
-
+        
         return preview;
     }
 
@@ -91,8 +85,6 @@ class NotificationContentCreator {
         summary.append(" ");
         summary.append(subject);
 
-        summary.setSpan(getEmphasizedSpan(), 0, sender.length(), 0);
-
         return summary;
     }
 
@@ -133,12 +125,4 @@ class NotificationContentCreator {
     private String getMessageSenderForDisplay(String sender) {
         return (sender != null) ? sender : context.getString(R.string.general_no_sender);
     }
-
-    private TextAppearanceSpan getEmphasizedSpan() {
-        if (emphasizedSpan == null) {
-            emphasizedSpan = new TextAppearanceSpan(context,
-                    R.style.TextAppearance_StatusBar_EventContent_Emphasized);
-        }
-        return emphasizedSpan;
-    }
 }
diff --git a/k9mail/src/main/res/values-v21/styles.xml b/k9mail/src/main/res/values-v21/styles.xml
deleted file mode 100644
index d3d90657f..000000000
--- a/k9mail/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="TextAppearance.StatusBar.EventContent.Emphasized" parent="@android:style/TextAppearance.StatusBar.EventContent">
-        <item name="android:textSize">16sp</item>
-    </style>
-</resources>
diff --git a/k9mail/src/main/res/values/styles.xml b/k9mail/src/main/res/values/styles.xml
index 8fd3127d1..f21f428b1 100644
--- a/k9mail/src/main/res/values/styles.xml
+++ b/k9mail/src/main/res/values/styles.xml
@@ -18,10 +18,6 @@
         <item name="android:textColor">@android:color/primary_text_light</item>
     </style>
 
-    <style name="TextAppearance.StatusBar.EventContent.Emphasized" parent="@android:style/TextAppearance.StatusBar.EventContent">
-        <item name="android:textSize">16sp</item>
-    </style>
-
     <style name="UnreadWidgetContainer">
         <item name="android:paddingTop">0dp</item>
         <item name="android:paddingLeft">0dp</item>