commit 88bf3cc283597b04fe500e541c1491941b5dc121
author Yorke Lee <yorkelee@google.com> Tue Sep 10 18:45:12 2013 -0700
committer Yorke Lee <yorkelee@google.com> Tue Sep 10 18:45:12 2013 -0700
tree 5f74dc583a567aa7394b9109f1bc8e32d939bbb6
parent 397b8b0222aa84ffcfbd1b9a150319a0dd22d6a2

Change call settings style to be consistent with dialer

Bug: 10678101
Change-Id: I081e892e160776b63c0f531309695e1133f52ed3

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bce7648..f102cb7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1444,4 +1444,8 @@
          related settings.
          [CHAR LIMIT=30] -->
     <string name="preference_category_ringtone">Ringtone &amp; Vibrate</string>
+
+    <!-- String resource for the font-family to use for the call setting activity's title
+         Do not translate. -->
+    <string name="call_settings_title_font_family">sans-serif-light</string>
 </resources>

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 900c893..c91f69b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -228,6 +228,8 @@
     <style name="DialtactsActionBarStyle"
            parent="@android:style/Widget.Holo.Light.ActionBar">
         <item name="android:background">@color/phone_settings_actionbar_color</item>
+        <!-- Empty icon -->
+        <item name="android:icon">@android:color/transparent</item>
     </style>
 
     <style name="SimImportTheme"

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index a1f73f2..e28e3d2 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -54,7 +54,10 @@
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.telephony.PhoneNumberUtils;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.TypefaceSpan;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.WindowManager;
@@ -1653,7 +1656,14 @@
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
             // android.R.id.home will be triggered in onOptionsItemSelected()
+            actionBar.setDisplayShowHomeEnabled(true);
             actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(true);
+
+            final SpannableString s = new SpannableString(getString(R.string.call_settings));
+            s.setSpan(new TypefaceSpan(getString(R.string.call_settings_title_font_family)), 0,
+                    s.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            actionBar.setTitle(s);
         }
     }