am c723b3f3: am d0acf226: am 79141087: Updates icons in Telephony and changes Sim activity action bar style.
* commit 'c723b3f3fdf195ac2191b53cc5402822a00bf2fa':
Updates icons in Telephony and changes Sim activity action bar style.
diff --git a/res/mipmap-hdpi/ic_launcher_contacts.png b/res/mipmap-hdpi/ic_launcher_contacts.png
index e0136f6..64eff00 100644
--- a/res/mipmap-hdpi/ic_launcher_contacts.png
+++ b/res/mipmap-hdpi/ic_launcher_contacts.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_launcher_phone.png b/res/mipmap-hdpi/ic_launcher_phone.png
index 47d7894..15c4142 100644
--- a/res/mipmap-hdpi/ic_launcher_phone.png
+++ b/res/mipmap-hdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_contacts.png b/res/mipmap-mdpi/ic_launcher_contacts.png
index 3d490c3..b4ee821 100644
--- a/res/mipmap-mdpi/ic_launcher_contacts.png
+++ b/res/mipmap-mdpi/ic_launcher_contacts.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_phone.png b/res/mipmap-mdpi/ic_launcher_phone.png
index 3b333cf..3088f75 100644
--- a/res/mipmap-mdpi/ic_launcher_phone.png
+++ b/res/mipmap-mdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_contacts.png b/res/mipmap-xhdpi/ic_launcher_contacts.png
index dde3cbb..6feeadf 100644
--- a/res/mipmap-xhdpi/ic_launcher_contacts.png
+++ b/res/mipmap-xhdpi/ic_launcher_contacts.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_phone.png b/res/mipmap-xhdpi/ic_launcher_phone.png
index 020c2fa..e87de01 100644
--- a/res/mipmap-xhdpi/ic_launcher_phone.png
+++ b/res/mipmap-xhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_contacts.png b/res/mipmap-xxhdpi/ic_launcher_contacts.png
index 99b403b..01a3fde 100644
--- a/res/mipmap-xxhdpi/ic_launcher_contacts.png
+++ b/res/mipmap-xxhdpi/ic_launcher_contacts.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_phone.png b/res/mipmap-xxhdpi/ic_launcher_phone.png
index 1594e4e..b866b79 100644
--- a/res/mipmap-xxhdpi/ic_launcher_phone.png
+++ b/res/mipmap-xxhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_contacts.png b/res/mipmap-xxxhdpi/ic_launcher_contacts.png
index 7d07add..328e067 100644
--- a/res/mipmap-xxxhdpi/ic_launcher_contacts.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_contacts.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_phone.png b/res/mipmap-xxxhdpi/ic_launcher_phone.png
index 8c92ac1..26f51f1 100644
--- a/res/mipmap-xxxhdpi/ic_launcher_phone.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c7701fc..2ceac5d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -45,8 +45,6 @@
<color name="actionbar_background_color_dark">@color/dialer_theme_color_dark</color>
<!-- Color for icons in the actionbar. Ensure this stays in sync with Dialer version. -->
<color name="actionbar_icon_color">#ffffff</color>
- <!-- Color of title text in actionbar. Ensure this stays in sync with Dialer version. -->
- <color name="actionbar_text_color">#ffffff</color>
<!-- Color for the setting text. -->
<color name="setting_primary_color">#4d4c4c</color>
@@ -54,5 +52,4 @@
<color name="setting_secondary_color">#989898</color>
<color name="dialer_dialpad_touch_tint">#330288d1</color>
<color name="floating_action_button_touch_tint">#80ffffff</color>
- <color name="dialer_theme_color">#0288d1</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d886dab..587cb33 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -231,12 +231,6 @@
<item name="*android:windowAnimationStyle">@style/InCallAnimationStyle</item>
</style>
- <style name="ContactsActionBarStyle"
- parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
- <item name="android:background">@color/people_app_theme_color</item>
- <item name="android:backgroundStacked">@color/people_app_theme_color</item>gs
- </style>
-
<!-- Style for the call settings action bar. Should be kept in sync with Dialer. -->
<style name="DialtactsActionBarStyle" parent="@style/TelephonyActionBarStyle">
<!-- Shift the title text to the right -->
@@ -271,9 +265,9 @@
<item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
</style>
- <style name="SimImportTheme"
- parent="@android:style/Theme.Holo.Light.DarkActionBar">
- <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
+ <style name="SimImportTheme" parent="@android:style/Theme.Material.Light">
+ <item name="android:actionBarStyle">@style/TelephonyActionBarStyle</item>
+ <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
</style>
<style name="OutgoingCallBroadcasterTheme" parent="@android:style/Theme.Holo.NoActionBar">
