diff options
19 files changed, 9 insertions, 9 deletions
diff --git a/res/drawable-hdpi/quickactions_icon_activated.9.png b/res/drawable-hdpi/quickactions_icon_activated.9.png Binary files differnew file mode 100644 index 000000000..b9ccc8007 --- /dev/null +++ b/res/drawable-hdpi/quickactions_icon_activated.9.png diff --git a/res/drawable-hdpi/quickcontact_slider_btn_on.9.png b/res/drawable-hdpi/quickcontact_slider_btn_on.9.png Binary files differdeleted file mode 100644 index ac2b496bc..000000000 --- a/res/drawable-hdpi/quickcontact_slider_btn_on.9.png +++ /dev/null diff --git a/res/drawable-hdpi/quickcontact_slider_btn_pressed.9.png b/res/drawable-hdpi/quickcontact_slider_btn_pressed.9.png Binary files differdeleted file mode 100644 index d9da59840..000000000 --- a/res/drawable-hdpi/quickcontact_slider_btn_pressed.9.png +++ /dev/null diff --git a/res/drawable-hdpi/quickcontact_slider_btn_selected.9.png b/res/drawable-hdpi/quickcontact_slider_btn_selected.9.png Binary files differdeleted file mode 100644 index 72d053b84..000000000 --- a/res/drawable-hdpi/quickcontact_slider_btn_selected.9.png +++ /dev/null diff --git a/res/drawable-hdpi/sym_action_email_holo_light.png b/res/drawable-hdpi/sym_action_email_holo_light.png Binary files differindex 166eda491..e1ff65f6b 100644 --- a/res/drawable-hdpi/sym_action_email_holo_light.png +++ b/res/drawable-hdpi/sym_action_email_holo_light.png diff --git a/res/drawable-hdpi/sym_action_goto_website_holo_light.png b/res/drawable-hdpi/sym_action_goto_website_holo_light.png Binary files differindex 39bb2f3cc..4c5c614f4 100644 --- a/res/drawable-hdpi/sym_action_goto_website_holo_light.png +++ b/res/drawable-hdpi/sym_action_goto_website_holo_light.png diff --git a/res/drawable-hdpi/sym_action_show_map_holo_light.png b/res/drawable-hdpi/sym_action_show_map_holo_light.png Binary files differindex 5ce0c644b..4c6ba98f5 100644 --- a/res/drawable-hdpi/sym_action_show_map_holo_light.png +++ b/res/drawable-hdpi/sym_action_show_map_holo_light.png diff --git a/res/drawable-hdpi/sym_action_talk_holo_light.png b/res/drawable-hdpi/sym_action_talk_holo_light.png Binary files differnew file mode 100644 index 000000000..62ad68756 --- /dev/null +++ b/res/drawable-hdpi/sym_action_talk_holo_light.png diff --git a/res/drawable-mdpi/quickactions_icon_activated.9.png b/res/drawable-mdpi/quickactions_icon_activated.9.png Binary files differnew file mode 100644 index 000000000..777c9882b --- /dev/null +++ b/res/drawable-mdpi/quickactions_icon_activated.9.png diff --git a/res/drawable-mdpi/quickcontact_slider_btn_on.9.png b/res/drawable-mdpi/quickcontact_slider_btn_on.9.png Binary files differdeleted file mode 100644 index 330f49b70..000000000 --- a/res/drawable-mdpi/quickcontact_slider_btn_on.9.png +++ /dev/null diff --git a/res/drawable-mdpi/quickcontact_slider_btn_pressed.9.png b/res/drawable-mdpi/quickcontact_slider_btn_pressed.9.png Binary files differdeleted file mode 100644 index d4916f5e1..000000000 --- a/res/drawable-mdpi/quickcontact_slider_btn_pressed.9.png +++ /dev/null diff --git a/res/drawable-mdpi/quickcontact_slider_btn_selected.9.png b/res/drawable-mdpi/quickcontact_slider_btn_selected.9.png Binary files differdeleted file mode 100644 index b91002890..000000000 --- a/res/drawable-mdpi/quickcontact_slider_btn_selected.9.png +++ /dev/null diff --git a/res/drawable-mdpi/sym_action_email_holo_light.png b/res/drawable-mdpi/sym_action_email_holo_light.png Binary files differindex f0713764e..3160adbd8 100644 --- a/res/drawable-mdpi/sym_action_email_holo_light.png +++ b/res/drawable-mdpi/sym_action_email_holo_light.png diff --git a/res/drawable-mdpi/sym_action_goto_website_holo_light.png b/res/drawable-mdpi/sym_action_goto_website_holo_light.png Binary files differindex 8b7c458cb..5b17bd2c7 100644 --- a/res/drawable-mdpi/sym_action_goto_website_holo_light.png +++ b/res/drawable-mdpi/sym_action_goto_website_holo_light.png diff --git a/res/drawable-mdpi/sym_action_show_map_holo_light.png b/res/drawable-mdpi/sym_action_show_map_holo_light.png Binary files differindex 805bda187..059e821ae 100644 --- a/res/drawable-mdpi/sym_action_show_map_holo_light.png +++ b/res/drawable-mdpi/sym_action_show_map_holo_light.png diff --git a/res/drawable-mdpi/sym_action_talk_holo_light.png b/res/drawable-mdpi/sym_action_talk_holo_light.png Binary files differnew file mode 100644 index 000000000..ff444d882 --- /dev/null +++ b/res/drawable-mdpi/sym_action_talk_holo_light.png diff --git a/res/drawable/quickcontact_slider_btn.xml b/res/drawable/quickcontact_slider_btn.xml index f6164df49..b3d0ec7d7 100644 --- a/res/drawable/quickcontact_slider_btn.xml +++ b/res/drawable/quickcontact_slider_btn.xml @@ -16,15 +16,15 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android" android:dither="true"> - <!-- TODO: We should be using framework resources here once they are finished --> + <!-- TODO Still a hack. This needs a default from the framework instead for the checked state --> <item android:state_checked="true" - android:drawable="@drawable/quickcontact_slider_btn_on" /> + android:drawable="@drawable/quickactions_icon_activated" /> <item android:state_window_focused="false" android:drawable="@android:color/transparent" /> <item android:state_pressed="true" - android:drawable="@drawable/quickcontact_slider_btn_pressed" /> + android:drawable="@drawable/quickactions_icon_activated" /> <item android:state_focused="true" - android:drawable="@drawable/quickcontact_slider_btn_selected" /> + android:drawable="@drawable/quickactions_icon_activated" /> <item android:drawable="@android:color/transparent" /> </selector> diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java index 4dd90361c..ee79dbb49 100644 --- a/src/com/android/contacts/ContactsUtils.java +++ b/src/com/android/contacts/ContactsUtils.java @@ -293,7 +293,7 @@ public class ContactsUtils { return new ImActions( new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message")), new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?call")), - android.R.drawable.sym_action_chat, + R.drawable.sym_action_talk_holo_light, R.drawable.sym_action_videochat ); } else if ((chatCapability & Im.CAPABILITY_HAS_VOICE) != 0) { @@ -301,14 +301,14 @@ public class ContactsUtils { return new ImActions( new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message")), new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?call")), - android.R.drawable.sym_action_chat, + R.drawable.sym_action_talk_holo_light, R.drawable.sym_action_audiochat ); } else { return new ImActions( new Intent(Intent.ACTION_SENDTO, Uri.parse("xmpp:" + data + "?message")), null, - android.R.drawable.sym_action_chat, + R.drawable.sym_action_talk_holo_light, -1 ); } @@ -328,7 +328,7 @@ public class ContactsUtils { return new ImActions( new Intent(Intent.ACTION_SENDTO, imUri), null, - android.R.drawable.sym_action_chat, + R.drawable.sym_action_talk_holo_light, -1 ); } else { diff --git a/src/com/android/contacts/model/FallbackAccountType.java b/src/com/android/contacts/model/FallbackAccountType.java index e30ad89e4..2b40634b2 100644 --- a/src/com/android/contacts/model/FallbackAccountType.java +++ b/src/com/android/contacts/model/FallbackAccountType.java @@ -299,7 +299,7 @@ public class FallbackAccountType extends AccountType { DataKind kind = getKindForMimetype(Im.CONTENT_ITEM_TYPE); if (kind == null) { kind = addKind(new DataKind(Im.CONTENT_ITEM_TYPE, R.string.imLabelsGroup, - android.R.drawable.sym_action_chat, 20, true)); + R.drawable.sym_action_talk_holo_light, 20, true)); kind.actionHeader = new ImActionInflater(); kind.actionBody = new SimpleInflater(Im.DATA); } |
