From 5f84e76212ab1ae15a507cb88f9a44557b640e80 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Wed, 27 Aug 2014 13:31:55 -0700
Subject: InCallUi image resource updates (mostly deletions).

- Deleted a ton of assets which were no longer used.
+ Automirrored some assets so their rtl copies could be removed.

Bug: 15862303
Change-Id: I8aa832eead1768c82741fbe97268ea44ba0fc9ff
---
 InCallUI/res/drawable-hdpi/img_no_image.png        | Bin 0 -> 5362 bytes
 .../ic_lockscreen_answer_normal.png                | Bin 6121 -> 0 bytes
 .../ic_sound_off_speakerphone_holo_dark.png        | Bin 5759 -> 0 bytes
 .../ic_sound_speakerphone_holo_dark.png            | Bin 6370 -> 0 bytes
 .../res/drawable-ldrtl-hdpi/picture_conference.png | Bin 11787 -> 0 bytes
 .../res/drawable-ldrtl-hdpi/picture_dialing.png    | Bin 9815 -> 0 bytes
 .../ic_lockscreen_answer_normal.png                | Bin 5408 -> 0 bytes
 .../ic_sound_off_speakerphone_holo_dark.png        | Bin 5034 -> 0 bytes
 .../ic_sound_speakerphone_holo_dark.png            | Bin 5406 -> 0 bytes
 .../res/drawable-ldrtl-mdpi/picture_conference.png | Bin 8623 -> 0 bytes
 .../res/drawable-ldrtl-mdpi/picture_dialing.png    | Bin 7473 -> 0 bytes
 .../ic_lockscreen_answer_normal.png                | Bin 7047 -> 0 bytes
 .../ic_sound_off_speakerphone_holo_dark.png        | Bin 6604 -> 0 bytes
 .../ic_sound_speakerphone_holo_dark.png            | Bin 7584 -> 0 bytes
 .../drawable-ldrtl-xhdpi/picture_conference.png    | Bin 16123 -> 0 bytes
 .../res/drawable-ldrtl-xhdpi/picture_dialing.png   | Bin 12979 -> 0 bytes
 .../res/drawable-mdpi/dial_num_0_no_plus_wht.png   | Bin 1374 -> 0 bytes
 .../res/drawable-mdpi/dial_num_1_no_vm_wht.png     | Bin 673 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_2_wht.png      | Bin 1820 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_3_wht.png      | Bin 1941 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_4_wht.png      | Bin 1404 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_5_wht.png      | Bin 1769 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_6_wht.png      | Bin 2023 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_7_wht.png      | Bin 1618 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_8_wht.png      | Bin 2097 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_9_wht.png      | Bin 2185 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_pound_wht.png  | Bin 805 -> 0 bytes
 InCallUI/res/drawable-mdpi/dial_num_star_wht.png   | Bin 757 -> 0 bytes
 InCallUI/res/drawable-mdpi/img_no_image.png        | Bin 0 -> 3509 bytes
 .../res/drawable-xhdpi/dial_num_0_no_plus_wht.png  | Bin 2344 -> 0 bytes
 .../res/drawable-xhdpi/dial_num_1_no_vm_wht.png    | Bin 965 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_2_wht.png     | Bin 3624 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_3_wht.png     | Bin 3695 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_4_wht.png     | Bin 2508 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_5_wht.png     | Bin 3304 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_6_wht.png     | Bin 4061 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_7_wht.png     | Bin 3322 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_8_wht.png     | Bin 4271 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_9_wht.png     | Bin 4525 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_pound_wht.png | Bin 1391 -> 0 bytes
 InCallUI/res/drawable-xhdpi/dial_num_star_wht.png  | Bin 1402 -> 0 bytes
 InCallUI/res/drawable-xhdpi/img_no_image.png       | Bin 0 -> 7369 bytes
 .../res/drawable-xxhdpi/dial_num_0_no_plus_wht.png | Bin 3056 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png    | Bin 3168 -> 0 bytes
 .../res/drawable-xxhdpi/dial_num_1_no_vm_wht.png   | Bin 1632 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png    | Bin 2830 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png    | Bin 3923 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png    | Bin 3930 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png    | Bin 2752 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png    | Bin 3683 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png    | Bin 4366 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png    | Bin 3534 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png    | Bin 4560 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png    | Bin 4734 -> 0 bytes
 .../res/drawable-xxhdpi/dial_num_pound_wht.png     | Bin 2123 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png | Bin 2425 -> 0 bytes
 InCallUI/res/drawable-xxhdpi/img_no_image.png      | Bin 0 -> 9850 bytes
 InCallUI/res/drawable-xxxhdpi/img_no_image.png     | Bin 0 -> 16251 bytes
 InCallUI/res/drawable/btn_change_to_video.xml      |   3 ++-
 InCallUI/res/drawable/btn_change_to_voice.xml      |   3 ++-
 InCallUI/res/drawable/btn_compound_audio.xml       |   7 ++++---
 InCallUI/res/drawable/btn_compound_mute.xml        |   3 ++-
 InCallUI/res/drawable/btn_compound_video_off.xml   |   3 ++-
 .../res/drawable/btn_compound_video_switch.xml     |   3 ++-
 .../ic_lockscreen_answer_activated_layer.xml       |   3 ++-
 .../drawable/ic_lockscreen_answer_normal_layer.xml |   3 ++-
 .../ic_lockscreen_answer_video_activated_layer.xml |   3 ++-
 .../ic_lockscreen_answer_video_normal_layer.xml    |   3 ++-
 ...ic_lockscreen_decline_video_activated_layer.xml |   3 ++-
 .../ic_lockscreen_decline_video_normal_layer.xml   |   3 ++-
 .../ic_lockscreen_text_activated_layer.xml         |   3 ++-
 .../drawable/ic_lockscreen_text_normal_layer.xml   |   3 ++-
 .../res/drawable/img_no_image_automirrored.xml     |  21 +++++++++++++++++++++
 InCallUI/res/layout-land/call_card_content.xml     |   2 +-
 InCallUI/res/layout/call_card_content.xml          |   2 +-
 .../src/com/android/incallui/CallCardFragment.java |   4 +++-
 .../src/com/android/incallui/ContactInfoCache.java |   6 ++++--
 77 files changed, 60 insertions(+), 21 deletions(-)
 create mode 100644 InCallUI/res/drawable-hdpi/img_no_image.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_normal.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-hdpi/ic_sound_off_speakerphone_holo_dark.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-hdpi/ic_sound_speakerphone_holo_dark.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-hdpi/picture_conference.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-hdpi/picture_dialing.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_normal.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-mdpi/ic_sound_off_speakerphone_holo_dark.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-mdpi/ic_sound_speakerphone_holo_dark.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-mdpi/picture_conference.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-mdpi/picture_dialing.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_normal.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_off_speakerphone_holo_dark.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_speakerphone_holo_dark.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-xhdpi/picture_conference.png
 delete mode 100644 InCallUI/res/drawable-ldrtl-xhdpi/picture_dialing.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_0_no_plus_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_1_no_vm_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_2_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_3_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_4_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_5_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_6_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_7_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_8_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_9_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_pound_wht.png
 delete mode 100644 InCallUI/res/drawable-mdpi/dial_num_star_wht.png
 create mode 100644 InCallUI/res/drawable-mdpi/img_no_image.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_0_no_plus_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_1_no_vm_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_2_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_3_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_4_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_5_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_6_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_7_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_8_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_9_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_pound_wht.png
 delete mode 100644 InCallUI/res/drawable-xhdpi/dial_num_star_wht.png
 create mode 100644 InCallUI/res/drawable-xhdpi/img_no_image.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png
 delete mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png
 create mode 100644 InCallUI/res/drawable-xxhdpi/img_no_image.png
 create mode 100644 InCallUI/res/drawable-xxxhdpi/img_no_image.png
 create mode 100644 InCallUI/res/drawable/img_no_image_automirrored.xml

diff --git a/InCallUI/res/drawable-hdpi/img_no_image.png b/InCallUI/res/drawable-hdpi/img_no_image.png
new file mode 100644
index 000000000..fd0ab3211
Binary files /dev/null and b/InCallUI/res/drawable-hdpi/img_no_image.png differ
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 3c23fe992..000000000
Binary files a/InCallUI/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_normal.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_off_speakerphone_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 2f2b67456..000000000
Binary files a/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_off_speakerphone_holo_dark.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_speakerphone_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 135c7f3a0..000000000
Binary files a/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_speakerphone_holo_dark.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/picture_conference.png b/InCallUI/res/drawable-ldrtl-hdpi/picture_conference.png
deleted file mode 100644
index ca250fdc9..000000000
Binary files a/InCallUI/res/drawable-ldrtl-hdpi/picture_conference.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/picture_dialing.png b/InCallUI/res/drawable-ldrtl-hdpi/picture_dialing.png
deleted file mode 100644
index cb587a88c..000000000
Binary files a/InCallUI/res/drawable-ldrtl-hdpi/picture_dialing.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 2a223ea06..000000000
Binary files a/InCallUI/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_normal.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_off_speakerphone_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 3f330acb6..000000000
Binary files a/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_off_speakerphone_holo_dark.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_speakerphone_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 6cf2e3c8b..000000000
Binary files a/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_speakerphone_holo_dark.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/picture_conference.png b/InCallUI/res/drawable-ldrtl-mdpi/picture_conference.png
deleted file mode 100644
index 2876d0f65..000000000
Binary files a/InCallUI/res/drawable-ldrtl-mdpi/picture_conference.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/picture_dialing.png b/InCallUI/res/drawable-ldrtl-mdpi/picture_dialing.png
deleted file mode 100644
index 4047b2258..000000000
Binary files a/InCallUI/res/drawable-ldrtl-mdpi/picture_dialing.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 72c2afa5b..000000000
Binary files a/InCallUI/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_normal.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_off_speakerphone_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 5bc066abb..000000000
Binary files a/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_off_speakerphone_holo_dark.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_speakerphone_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 3999712a5..000000000
Binary files a/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_speakerphone_holo_dark.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/picture_conference.png b/InCallUI/res/drawable-ldrtl-xhdpi/picture_conference.png
deleted file mode 100644
index 50b4e3577..000000000
Binary files a/InCallUI/res/drawable-ldrtl-xhdpi/picture_conference.png and /dev/null differ
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/picture_dialing.png b/InCallUI/res/drawable-ldrtl-xhdpi/picture_dialing.png
deleted file mode 100644
index f167ecbe8..000000000
Binary files a/InCallUI/res/drawable-ldrtl-xhdpi/picture_dialing.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_0_no_plus_wht.png b/InCallUI/res/drawable-mdpi/dial_num_0_no_plus_wht.png
deleted file mode 100644
index 1d8b0e3e2..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_0_no_plus_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_1_no_vm_wht.png b/InCallUI/res/drawable-mdpi/dial_num_1_no_vm_wht.png
deleted file mode 100644
index e253724d6..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_1_no_vm_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_2_wht.png b/InCallUI/res/drawable-mdpi/dial_num_2_wht.png
deleted file mode 100644
index e311f4f64..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_2_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_3_wht.png b/InCallUI/res/drawable-mdpi/dial_num_3_wht.png
deleted file mode 100644
index f07324a38..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_3_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_4_wht.png b/InCallUI/res/drawable-mdpi/dial_num_4_wht.png
deleted file mode 100644
index cd8d33c89..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_4_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_5_wht.png b/InCallUI/res/drawable-mdpi/dial_num_5_wht.png
deleted file mode 100644
index a9f27dc3a..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_5_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_6_wht.png b/InCallUI/res/drawable-mdpi/dial_num_6_wht.png
deleted file mode 100644
index 2bdf08e51..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_6_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_7_wht.png b/InCallUI/res/drawable-mdpi/dial_num_7_wht.png
deleted file mode 100644
index 6c1c599a5..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_7_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_8_wht.png b/InCallUI/res/drawable-mdpi/dial_num_8_wht.png
deleted file mode 100644
index db0694ce1..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_8_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_9_wht.png b/InCallUI/res/drawable-mdpi/dial_num_9_wht.png
deleted file mode 100644
index 692fdb06e..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_9_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_pound_wht.png b/InCallUI/res/drawable-mdpi/dial_num_pound_wht.png
deleted file mode 100644
index f216d0502..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_pound_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/dial_num_star_wht.png b/InCallUI/res/drawable-mdpi/dial_num_star_wht.png
deleted file mode 100644
index f7e8e9f73..000000000
Binary files a/InCallUI/res/drawable-mdpi/dial_num_star_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-mdpi/img_no_image.png b/InCallUI/res/drawable-mdpi/img_no_image.png
new file mode 100644
index 000000000..014a1c414
Binary files /dev/null and b/InCallUI/res/drawable-mdpi/img_no_image.png differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_0_no_plus_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_0_no_plus_wht.png
deleted file mode 100644
index 11ca993c1..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_0_no_plus_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_1_no_vm_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_1_no_vm_wht.png
deleted file mode 100644
index 8d2ac70ae..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_1_no_vm_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_2_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_2_wht.png
deleted file mode 100644
index 12c4ab9ba..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_2_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_3_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_3_wht.png
deleted file mode 100644
index 4353e8a39..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_3_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_4_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_4_wht.png
deleted file mode 100644
index ccee5cce7..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_4_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_5_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_5_wht.png
deleted file mode 100644
index f27f153cd..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_5_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_6_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_6_wht.png
deleted file mode 100644
index 8966d13d3..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_6_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_7_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_7_wht.png
deleted file mode 100644
index b01881058..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_7_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_8_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_8_wht.png
deleted file mode 100644
index 7c7b4f8db..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_8_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_9_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_9_wht.png
deleted file mode 100644
index 23984f03d..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_9_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_pound_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_pound_wht.png
deleted file mode 100644
index be21af8d8..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_pound_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/dial_num_star_wht.png b/InCallUI/res/drawable-xhdpi/dial_num_star_wht.png
deleted file mode 100644
index 061a4946f..000000000
Binary files a/InCallUI/res/drawable-xhdpi/dial_num_star_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xhdpi/img_no_image.png b/InCallUI/res/drawable-xhdpi/img_no_image.png
new file mode 100644
index 000000000..4022207d0
Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/img_no_image.png differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png
deleted file mode 100644
index 36d65c784..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png
deleted file mode 100644
index 373723282..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png
deleted file mode 100644
index a41c6786c..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png
deleted file mode 100644
index e2afb2fc4..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png
deleted file mode 100644
index e4dd69e0f..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png
deleted file mode 100644
index 42b37c7b9..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png
deleted file mode 100644
index 37bf49c4c..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png
deleted file mode 100644
index a1638488d..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png
deleted file mode 100644
index 3ff9d39b2..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png
deleted file mode 100644
index bc9162199..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png
deleted file mode 100644
index 84b2f1cb7..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png
deleted file mode 100644
index ced1c9451..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png
deleted file mode 100644
index ab2758c38..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png
deleted file mode 100644
index 75ce19836..000000000
Binary files a/InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png and /dev/null differ
diff --git a/InCallUI/res/drawable-xxhdpi/img_no_image.png b/InCallUI/res/drawable-xxhdpi/img_no_image.png
new file mode 100644
index 000000000..2cf7f23a0
Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/img_no_image.png differ
diff --git a/InCallUI/res/drawable-xxxhdpi/img_no_image.png b/InCallUI/res/drawable-xxxhdpi/img_no_image.png
new file mode 100644
index 000000000..216574222
Binary files /dev/null and b/InCallUI/res/drawable-xxxhdpi/img_no_image.png differ
diff --git a/InCallUI/res/drawable/btn_change_to_video.xml b/InCallUI/res/drawable/btn_change_to_video.xml
index 255b9b6ce..962539e4f 100644
--- a/InCallUI/res/drawable/btn_change_to_video.xml
+++ b/InCallUI/res/drawable/btn_change_to_video.xml
@@ -23,7 +23,8 @@
     <item>
         <bitmap android:src="@drawable/ic_toolbar_video"
             android:gravity="center"
-            android:tint="@color/selectable_icon_tint" />
+            android:tint="@color/selectable_icon_tint"
+            android:autoMirrored="true" />
     </item>
 
 </layer-list>
\ No newline at end of file
diff --git a/InCallUI/res/drawable/btn_change_to_voice.xml b/InCallUI/res/drawable/btn_change_to_voice.xml
index 974dd4a2e..fdeae071b 100644
--- a/InCallUI/res/drawable/btn_change_to_voice.xml
+++ b/InCallUI/res/drawable/btn_change_to_voice.xml
@@ -23,7 +23,8 @@
     <item>
         <bitmap android:src="@drawable/ic_toolbar_audio_phone"
             android:gravity="center"
-            android:tint="@color/selectable_icon_tint" />
+            android:tint="@color/selectable_icon_tint"
+            android:autoMirrored="true" />
     </item>
 
 </layer-list>
\ No newline at end of file
diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml
index 9c474c956..568f705bb 100644
--- a/InCallUI/res/drawable/btn_compound_audio.xml
+++ b/InCallUI/res/drawable/btn_compound_audio.xml
@@ -72,7 +72,7 @@
     <item android:id="@+id/bluetoothItem">
         <bitmap android:src="@drawable/ic_toolbar_audio_bluetooth"
                 android:gravity="center"
-                android:tint="@color/selectable_icon_tint"  />
+                android:tint="@color/selectable_icon_tint" />
     </item>
 
 
@@ -86,8 +86,9 @@
     <!-- Speakerphone icon showing 'speaker on' state -->
     <item android:id="@+id/speakerphoneItem">
         <bitmap android:src="@drawable/ic_toolbar_speaker_on"
-                android:gravity="center"
-                android:tint="@color/selectable_icon_tint" />
+            android:gravity="center"
+            android:tint="@color/selectable_icon_tint"
+            android:autoMirrored="true" />
     </item>
 
     <!-- Generic "audio mode" icon. -->
diff --git a/InCallUI/res/drawable/btn_compound_mute.xml b/InCallUI/res/drawable/btn_compound_mute.xml
index 68a8c9b34..53be386e7 100644
--- a/InCallUI/res/drawable/btn_compound_mute.xml
+++ b/InCallUI/res/drawable/btn_compound_mute.xml
@@ -24,7 +24,8 @@
     <item>
         <bitmap android:src="@drawable/ic_toolbar_mic_off"
             android:gravity="center"
-            android:tint="@color/selectable_icon_tint" />
+            android:tint="@color/selectable_icon_tint"
+            android:autoMirrored="true" />
     </item>
 
 </layer-list>
diff --git a/InCallUI/res/drawable/btn_compound_video_off.xml b/InCallUI/res/drawable/btn_compound_video_off.xml
index 776df50ff..8af4209d3 100644
--- a/InCallUI/res/drawable/btn_compound_video_off.xml
+++ b/InCallUI/res/drawable/btn_compound_video_off.xml
@@ -25,7 +25,8 @@
     <item>
         <bitmap android:src="@drawable/ic_toolbar_video_off"
             android:gravity="center"
-            android:tint="@color/selectable_icon_tint" />
+            android:tint="@color/selectable_icon_tint"
+            android:autoMirrored="true" />
     </item>
 
 </layer-list>
diff --git a/InCallUI/res/drawable/btn_compound_video_switch.xml b/InCallUI/res/drawable/btn_compound_video_switch.xml
index aa1459370..ef171ab9c 100644
--- a/InCallUI/res/drawable/btn_compound_video_switch.xml
+++ b/InCallUI/res/drawable/btn_compound_video_switch.xml
@@ -25,7 +25,8 @@
     <item>
         <bitmap android:src="@drawable/ic_toolbar_video_switch"
             android:gravity="center"
-            android:tint="@color/selectable_icon_tint" />
+            android:tint="@color/selectable_icon_tint"
+            android:autoMirrored="true" />
     </item>
 
 </layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml
index dd227d5a0..c615295ed 100644
--- a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml
@@ -19,6 +19,7 @@
         <bitmap
             android:gravity="center"
             android:src="@drawable/fab_ic_call"
-            android:tint="@color/glowpad_widget_active_color" />
+            android:tint="@color/glowpad_widget_active_color"
+            android:autoMirrored="true" />
     </item>
 </layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml
index 28988239c..31b884f99 100644
--- a/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_answer_normal_layer.xml
@@ -27,6 +27,7 @@
         <bitmap
             android:gravity="center"
             android:src="@drawable/fab_ic_call"
-            android:tint="@color/glowpad_call_widget_normal_tint" />
+            android:tint="@color/glowpad_call_widget_normal_tint"
+            android:autoMirrored="true" />
     </item>
 </layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml
index 57a3c09d8..7895e1b6d 100644
--- a/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml
@@ -20,6 +20,7 @@
         <bitmap
             android:gravity="center"
             android:src="@drawable/ic_videocam"
-            android:tint="@color/glowpad_widget_active_color" />
+            android:tint="@color/glowpad_widget_active_color"
+            android:autoMirrored="true" />
     </item>
 </layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_video_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_video_normal_layer.xml
index 708bbcc9c..793a36e10 100644
--- a/InCallUI/res/drawable/ic_lockscreen_answer_video_normal_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_answer_video_normal_layer.xml
@@ -28,6 +28,7 @@
         <bitmap
             android:gravity="center"
             android:src="@drawable/ic_videocam"
-            android:tint="@color/glowpad_call_widget_normal_tint" />
+            android:tint="@color/glowpad_call_widget_normal_tint"
+            android:autoMirrored="true" />
     </item>
 </layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_decline_video_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_decline_video_activated_layer.xml
index 63fe4cad8..0790aed19 100644
--- a/InCallUI/res/drawable/ic_lockscreen_decline_video_activated_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_decline_video_activated_layer.xml
@@ -20,6 +20,7 @@
         <bitmap
             android:gravity="center"
             android:src="@drawable/ic_toolbar_video_off"
-            android:tint="@color/glowpad_widget_active_color" />
+            android:tint="@color/glowpad_widget_active_color"
+            android:autoMirrored="true" />
     </item>
 </layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_decline_video_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_decline_video_normal_layer.xml
index 370d515e7..e247f0a3f 100644
--- a/InCallUI/res/drawable/ic_lockscreen_decline_video_normal_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_decline_video_normal_layer.xml
@@ -28,6 +28,7 @@
         <bitmap
             android:gravity="center"
             android:src="@drawable/ic_toolbar_video_off"
-            android:tint="@color/glowpad_call_widget_normal_tint" />
+            android:tint="@color/glowpad_call_widget_normal_tint"
+            android:autoMirrored="true" />
     </item>
 </layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml
index 040b39913..a74e36b31 100644
--- a/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_text_activated_layer.xml
@@ -26,6 +26,7 @@
         <bitmap
             android:gravity="center"
             android:src="@drawable/fab_ic_message"
-            android:tint="@color/glowpad_widget_active_color" />
+            android:tint="@color/glowpad_widget_active_color"
+            android:autoMirrored="true" />
     </item>
 </layer-list>
diff --git a/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml b/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml
index 950d1c38c..be32d0baa 100644
--- a/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_text_normal_layer.xml
@@ -27,6 +27,7 @@
         <bitmap
             android:gravity="center"
             android:src="@drawable/fab_ic_message"
-            android:tint="@color/glowpad_text_widget_normal_tint" />
+            android:tint="@color/glowpad_text_widget_normal_tint"
+            android:autoMirrored="true" />
     </item>
 </layer-list>
diff --git a/InCallUI/res/drawable/img_no_image_automirrored.xml b/InCallUI/res/drawable/img_no_image_automirrored.xml
new file mode 100644
index 000000000..f0cf0db31
--- /dev/null
+++ b/InCallUI/res/drawable/img_no_image_automirrored.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/img_no_image"
+    android:autoMirrored="true" />
\ No newline at end of file
diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml
index ddcd40342..336b46963 100644
--- a/InCallUI/res/layout-land/call_card_content.xml
+++ b/InCallUI/res/layout-land/call_card_content.xml
@@ -63,7 +63,7 @@
         android:gravity="start|center_vertical"
         android:scaleType="centerCrop"
         android:contentDescription="@string/contactPhoto"
-        android:src="@drawable/picture_unknown" />
+        android:src="@drawable/img_no_image_automirrored" />
 
     <include layout="@layout/manage_conference_call_button"
         android:layout_width="match_parent"
diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml
index 6d0ee8802..0e8650fc4 100644
--- a/InCallUI/res/layout/call_card_content.xml
+++ b/InCallUI/res/layout/call_card_content.xml
@@ -67,7 +67,7 @@
         android:gravity="top|center_horizontal"
         android:scaleType="centerCrop"
         android:contentDescription="@string/contactPhoto"
-        android:src="@drawable/picture_unknown" />
+        android:src="@drawable/img_no_image_automirrored" />
 
     <fragment android:name="com.android.incallui.VideoCallFragment"
         android:id="@+id/videoCallFragment"
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 600689c84..f5e718c8b 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -432,6 +432,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         if (isConference) {
             name = getConferenceString(isGeneric);
             photo = getConferencePhoto(isGeneric);
+            photo.setAutoMirrored(true);
             nameIsNumber = false;
         }
 
@@ -596,7 +597,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
     private void setDrawableToImageView(ImageView view, Drawable photo) {
         if (photo == null) {
-            photo = view.getResources().getDrawable(R.drawable.picture_unknown);
+            photo = view.getResources().getDrawable(R.drawable.img_no_image);
+            photo.setAutoMirrored(true);
         }
 
         final Drawable current = view.getDrawable();
diff --git a/InCallUI/src/com/android/incallui/ContactInfoCache.java b/InCallUI/src/com/android/incallui/ContactInfoCache.java
index ccf5b794b..70a7f841e 100644
--- a/InCallUI/src/com/android/incallui/ContactInfoCache.java
+++ b/InCallUI/src/com/android/incallui/ContactInfoCache.java
@@ -312,10 +312,12 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete
             if (info.cachedPhoto != null) {
                 photo = info.cachedPhoto;
             } else {
-                photo = context.getResources().getDrawable(R.drawable.picture_unknown);
+                photo = context.getResources().getDrawable(R.drawable.img_no_image);
+                photo.setAutoMirrored(true);
             }
         } else if (info.contactDisplayPhotoUri == null) {
-            photo = context.getResources().getDrawable(R.drawable.picture_unknown);
+            photo = context.getResources().getDrawable(R.drawable.img_no_image);
+            photo.setAutoMirrored(true);
         } else {
             cce.displayPhotoUri = info.contactDisplayPhotoUri;
         }
-- 
cgit v1.2.3