From 13983be7998ea28cc4b8882e1b45eff5ca4986a6 Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Fri, 26 Jun 2015 11:08:26 +0200
Subject: Make header text and tertiary text color themeable

---
 .../java/org/sufficientlysecure/keychain/ui/util/Highlighter.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Highlighter.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Highlighter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Highlighter.java
index 22c5315a9..ac34d5526 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Highlighter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/Highlighter.java
@@ -18,12 +18,11 @@
 package org.sufficientlysecure.keychain.ui.util;
 
 import android.content.Context;
-import android.content.res.Resources.Theme;
 import android.text.Spannable;
 import android.text.style.ForegroundColorSpan;
-import android.util.TypedValue;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -47,10 +46,7 @@ public class Highlighter {
         Pattern pattern = Pattern.compile("(?i)(" + mQuery.trim().replaceAll("\\s+", "|") + ")");
         Matcher matcher = pattern.matcher(text);
 
-        TypedValue typedValue = new TypedValue();
-        Theme theme = mContext.getTheme();
-        theme.resolveAttribute(R.attr.colorEmphasis, typedValue, true);
-        int colorEmphasis = typedValue.data;
+        int colorEmphasis = FormattingUtils.getColorFromAttr(mContext, R.attr.colorEmphasis);
 
         while (matcher.find()) {
             highlight.setSpan(
-- 
cgit v1.2.3