Merge pull request #905 from benalbrecht/dialog_icons

Use modern icons in info and alert dialogs for ICS+
2025-08-26 04:38:03 +00:00 · 2014-03-02 14:01:52 -08:00
parent 5cd8c922d2 0f6c7660cb
commit 367b481d07
35 changed files with 88 additions and 48 deletions
--- a/res/drawable-hdpi/ic_dialog_alert_holo_dark.png
+++ b/res/drawable-hdpi/ic_dialog_alert_holo_dark.png
--- a/res/drawable-hdpi/ic_dialog_alert_holo_light.png
+++ b/res/drawable-hdpi/ic_dialog_alert_holo_light.png
--- a/res/drawable-hdpi/ic_dialog_info_holo_dark.png
+++ b/res/drawable-hdpi/ic_dialog_info_holo_dark.png
--- a/res/drawable-hdpi/ic_dialog_info_holo_light.png
+++ b/res/drawable-hdpi/ic_dialog_info_holo_light.png
--- a/res/drawable-mdpi/ic_dialog_alert_holo_dark.png
+++ b/res/drawable-mdpi/ic_dialog_alert_holo_dark.png
--- a/res/drawable-mdpi/ic_dialog_alert_holo_light.png
+++ b/res/drawable-mdpi/ic_dialog_alert_holo_light.png
--- a/res/drawable-mdpi/ic_dialog_info_holo_dark.png
+++ b/res/drawable-mdpi/ic_dialog_info_holo_dark.png
--- a/res/drawable-mdpi/ic_dialog_info_holo_light.png
+++ b/res/drawable-mdpi/ic_dialog_info_holo_light.png
--- a/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
+++ b/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
--- a/res/drawable-xhdpi/ic_dialog_alert_holo_light.png
+++ b/res/drawable-xhdpi/ic_dialog_alert_holo_light.png
--- a/res/drawable-xhdpi/ic_dialog_info_holo_dark.png
+++ b/res/drawable-xhdpi/ic_dialog_info_holo_dark.png
--- a/res/drawable-xhdpi/ic_dialog_info_holo_light.png
+++ b/res/drawable-xhdpi/ic_dialog_info_holo_light.png
--- a/res/drawable-xxhdpi/ic_dialog_alert_holo_dark.png
+++ b/res/drawable-xxhdpi/ic_dialog_alert_holo_dark.png
--- a/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png
+++ b/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png
--- a/res/drawable-xxhdpi/ic_dialog_info_holo_dark.png
+++ b/res/drawable-xxhdpi/ic_dialog_info_holo_dark.png
--- a/res/drawable-xxhdpi/ic_dialog_info_holo_light.png
+++ b/res/drawable-xxhdpi/ic_dialog_info_holo_light.png
--- a/res/values-v11/resources.xml
+++ b/res/values-v11/resources.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="drawable" name="ic_dialog_info_light">@drawable/ic_dialog_info_holo_light</item>
+    <item type="drawable" name="ic_dialog_info_dark">@drawable/ic_dialog_info_holo_dark</item>
+    <item type="drawable" name="ic_dialog_alert_light">@drawable/ic_dialog_alert_holo_light</item>
+    <item type="drawable" name="ic_dialog_alert_dark">@drawable/ic_dialog_alert_holo_dark</item>
+</resources>
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -35,6 +35,8 @@
    <attr name="conversation_item_sent_triangle_background" format="reference" />
    <attr name="conversation_item_sent_push_background" format="reference" />
    <attr name="conversation_item_sent_push_triangle_background" format="reference" />
+    <attr name="dialog_info_icon" format="reference" />
+    <attr name="dialog_alert_icon" format="reference" />

    <attr name="contact_selection_push_user" format="reference|color" />
    <attr name="contact_selection_lay_user" format="reference|color" />
--- a/res/values/resources.xml
+++ b/res/values/resources.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="drawable" name="ic_dialog_info_light">@android:drawable/ic_dialog_info</item>
+    <item type="drawable" name="ic_dialog_alert_light">@android:drawable/ic_dialog_alert</item>
+    <item type="drawable" name="ic_dialog_info_dark">@android:drawable/ic_dialog_info</item>
+    <item type="drawable" name="ic_dialog_alert_dark">@android:drawable/ic_dialog_alert</item>
+</resources>
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -39,6 +39,8 @@
        <item name="conversation_item_sent_triangle_background">@drawable/conversation_item_sent_triangle_shape</item>
        <item name="conversation_item_sent_push_background">@drawable/conversation_item_sent_push_shape</item>
        <item name="conversation_item_sent_push_triangle_background">@drawable/conversation_item_sent_push_triangle_shape</item>
+        <item name="dialog_info_icon">@drawable/ic_dialog_info_light</item>
+        <item name="dialog_alert_icon">@drawable/ic_dialog_alert_light</item>

        <item name="menu_new_conversation_icon">@drawable/ic_action_new_holo_light</item>
        <item name="menu_new_group_icon">@drawable/ic_action_add_group_holo_light</item>
@@ -93,6 +95,8 @@
        <item name="conversation_item_sent_triangle_background">@drawable/conversation_item_sent_triangle_shape_dark</item>
        <item name="conversation_item_sent_push_background">@drawable/conversation_item_sent_push_shape_dark</item>
        <item name="conversation_item_sent_push_triangle_background">@drawable/conversation_item_sent_push_triangle_shape_dark</item>
+        <item name="dialog_info_icon">@drawable/ic_dialog_info_dark</item>
+        <item name="dialog_alert_icon">@drawable/ic_dialog_alert_dark</item>

        <item name="actionbar_icon">@drawable/actionbar_icon_holo_dark</item>
        <item name="lower_right_divet">@drawable/divet_lower_right_light</item>