commit 48706dbdf65d8612071a2db66cc874cc3feaed97
author Alice Yang <alice@google.com> Fri Feb 01 17:56:52 2013 -0800
committer Alice Yang <alice@google.com> Fri Feb 01 17:56:52 2013 -0800
tree 13582b47464aa472a7f32bca9b67381a0a8a21e4
parent 3a71913fc390cbd93b1980a9ee8f74448ccca031

Cherrypick from UB1.1:
Restore text font size and color in action bar back to dark grey and 16dp.

Bug: 8116938
Change-Id: Idee3d45069e0532f06b6401ba2a086f8d3e26a11

res/layout/actionbar_subject.xml

diff --git a/res/layout/actionbar_subject.xml b/res/layout/actionbar_subject.xml
index e4b0fc5..64633f0 100644
--- a/res/layout/actionbar_subject.xml
+++ b/res/layout/actionbar_subject.xml
@@ -17,7 +17,7 @@
 -->
 
 <!-- WARNING: this view's styling must match styling in framework's ActionBarView and -->
-<!-- action_bar_title_item.xml -->
+<!-- action_bar_title_item.xml except for font size which we override -->
 <com.android.mail.browse.SnippetTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/conversation_subject"
@@ -25,6 +25,7 @@
     android:layout_height="match_parent"
     android:visibility="gone"
     android:paddingRight="8dp"
+    android:textSize="16dp"
     android:gravity="center_vertical"
     android:maxLines="2"
     android:ellipsize="end"

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8b50f2f..4a2ba35 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -395,6 +395,10 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
     </style>
+    <style name="SubjectActionBarTitleText" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
+        <item name="android:textColor">#323232</item>
+        <item name="android:textSize">16dp</item>
+    </style>
     <!-- End conversation view message header styles -->
 
     <!-- Folder styles -->

src/com/android/mail/ui/MailActionBarView.java

diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index 4a09658..e4f2a82 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -27,7 +27,10 @@
 import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
 import android.util.AttributeSet;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -637,7 +640,15 @@
             return;
         }
 
-        mActionBar.setTitle(subject);
+        // Use a smaller font size than the default action bar title text size
+        SpannableStringBuilder builder = new SpannableStringBuilder();
+        SpannableString textSizeSpannable = new SpannableString(subject);
+        textSizeSpannable.setSpan(
+            new TextAppearanceSpan(getContext(), R.style.SubjectActionBarTitleText),
+            0, subject.length(), 0);
+        builder.append(textSizeSpannable);
+
+        mActionBar.setTitle(builder);
         mActionBar.setSubtitle(null);
         mSubjectView.setText(subject);
     }