am d1e70b84: am e7f36152: am 710f7eb3: Merge "Modify Action Bar for Telephony Call Settings so they match Dialer" into lmp-dev
* commit 'd1e70b84743f863635101372e700439da1174afb':
Modify Action Bar for Telephony Call Settings so they match Dialer
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ae0a7c1..0cd350b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -95,6 +95,7 @@
So, (94 - 38)/2 ==> 28dp -->
<dimen name="incoming_call_widget_asset_margin">28dp</dimen>
<!-- Action bar dimensions. Keep in sync with same value in Dialer. -->
- <dimen name="action_bar_height">64dp</dimen>
+ <dimen name="action_bar_height">56dp</dimen>
+ <dimen name="action_bar_elevation">2dp</dimen>
<dimen name="actionbar_contentInsetStart">72dp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 76b100a..afc1bd2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -242,6 +242,7 @@
<item name="android:background">@color/actionbar_background_color</item>
<item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
<item name="android:height">@dimen/action_bar_height</item>
+ <item name="android:elevation">@dimen/action_bar_elevation</item>
<!-- Empty icon -->
<item name="android:icon">@android:color/transparent</item>
<!-- Shift the title text to the right -->
@@ -250,7 +251,7 @@
<!-- Text in the action bar at the top of the screen. Should be kept in sync with Dialer. -->
<style name="DialtactsActionBarTitleText"
- parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
+ parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
<item name="android:textColor">@color/phone_settings_actionbar_text_color</item>
</style>