summaryrefslogtreecommitdiff
path: root/res/values/styles.xml
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-08-13 12:03:47 -0700
committerNancy Chen <nancychen@google.com>2015-08-13 14:30:01 -0700
commit44898ad0aa2a12788fc9cfc6b78fa7adc9d90f23 (patch)
treeb484d58e0009d6336c83c463440d3ecf95ce5d8f /res/values/styles.xml
parentf5250369eb99d5f2b435be845b5bb19a531538bb (diff)
Convert Dialer activities to AppCompat to support Snackbar.
In order to add an "Undo" snackbar for voicemail, dialer activities need to inherit from the AppCompat library. Add the relevant libraries to the make files and change the styles to be compatible. Bug: 22460745 Change-Id: Ia3cc4002cbd943da818fec67f888d085d53a3b25
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r--res/values/styles.xml31
1 files changed, 28 insertions, 3 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e3a2f9974..17b4a2561 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,15 +15,21 @@
~ limitations under the License
-->
<resources>
- <style name="DialtactsTheme"
- parent="android:Theme.Material.Light">
+ <style name="DialtactsTheme" parent="Theme.AppCompat.Light">
<item name="android:textColorPrimary">@color/dialtacts_primary_text_color</item>
<item name="android:textColorSecondary">@color/dialtacts_secondary_text_color</item>
+
+ <!-- Styles that require AppCompat compatibility, remember to update both sets -->
<item name="android:windowActionBarOverlay">true</item>
+ <item name="windowActionBarOverlay">true</item>
<item name="android:windowActionModeOverlay">true</item>
+ <item name="windowActionModeOverlay">true</item>
<item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
+ <item name="actionBarStyle">@style/DialtactsActionBarStyle</item>
<!-- Style for the overflow button in the actionbar. -->
<item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item>
+ <item name="actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item>
+
<!-- Drawable for the back button -->
<item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
<item name="android:windowContentOverlay">@null</item>
@@ -96,13 +102,19 @@
</style>
<style name="DialtactsThemeWithoutActionBarOverlay" parent="DialtactsTheme">
+ <!-- Styles that require AppCompat compatibility, remember to update both sets -->
<item name="android:windowActionBarOverlay">false</item>
+ <item name="windowActionBarOverlay">false</item>
<item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item>
+ <item name="actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item>
</style>
<!-- Hide the actionbar title during the activity preview -->
<style name="DialtactsActivityTheme" parent="DialtactsTheme">
+ <!-- Styles that require AppCompat compatibility, remember to update both sets -->
<item name="android:actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item>
+ <item name="actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item>
+
<item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>
<item name="android:fastScrollTrackDrawable">@null</item>
</style>
@@ -121,23 +133,36 @@
<item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item>
</style>
- <style name="DialtactsActionBarStyle" parent="android:Widget.Material.ActionBar">
+ <style name="DialtactsActionBarStyle"
+ parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+ <!-- Styles that require AppCompat compatibility, remember to update both sets -->
<item name="android:background">@color/actionbar_background_color</item>
+ <item name="background">@color/actionbar_background_color</item>
<item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
+ <item name="titleTextStyle">@style/DialtactsActionBarTitleText</item>
<item name="android:height">@dimen/action_bar_height</item>
+ <item name="height">@dimen/action_bar_height</item>
<item name="android:elevation">@dimen/action_bar_elevation</item>
+ <item name="elevation">@dimen/action_bar_elevation</item>
<!-- Empty icon -->
<item name="android:icon">@android:color/transparent</item>
+ <item name="icon">@android:color/transparent</item>
<!-- Shift the title text to the right -->
<item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
+ <item name="contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
<style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle">
+ <!-- Styles that require AppCompat compatibility, remember to update both sets -->
<item name="android:displayOptions"></item>
+ <item name="displayOptions"></item>
<item name="android:height">@dimen/action_bar_height_large</item>
+ <item name="height">@dimen/action_bar_height_large</item>
<!-- Override ActionBar title offset to keep search box aligned left -->
<item name="android:contentInsetStart">0dp</item>
+ <item name="contentInsetStart">0dp</item>
<item name="android:contentInsetEnd">0dp</item>
+ <item name="contentInsetEnd">0dp</item>
</style>
<!-- Text in the action bar at the top of the screen -->