From 8c16788ad048c8978bbda5682c9a7e588c54e7e3 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Tue, 20 May 2014 15:58:08 -0700 Subject: Replace merge/swap icons in InCallUI. Change-Id: I721dbfcac28add9f5cea4326a0cefb5384fa44a6 --- .../res/drawable-hdpi/ic_incall_switch_holo_dark.png | Bin 1913 -> 0 bytes InCallUI/res/drawable-hdpi/ic_merge_holo_dark.png | Bin 1340 -> 0 bytes InCallUI/res/drawable-hdpi/ic_toolbar_merge.png | Bin 0 -> 922 bytes InCallUI/res/drawable-hdpi/ic_toolbar_swap.png | Bin 0 -> 1112 bytes .../res/drawable-mdpi/ic_incall_switch_holo_dark.png | Bin 1246 -> 0 bytes InCallUI/res/drawable-mdpi/ic_merge_holo_dark.png | Bin 975 -> 0 bytes InCallUI/res/drawable-mdpi/ic_toolbar_merge.png | Bin 0 -> 756 bytes InCallUI/res/drawable-mdpi/ic_toolbar_swap.png | Bin 0 -> 807 bytes .../res/drawable-xhdpi/ic_incall_switch_holo_dark.png | Bin 2643 -> 0 bytes InCallUI/res/drawable-xhdpi/ic_merge_holo_dark.png | Bin 1840 -> 0 bytes InCallUI/res/drawable-xhdpi/ic_toolbar_merge.png | Bin 0 -> 1177 bytes InCallUI/res/drawable-xhdpi/ic_toolbar_swap.png | Bin 0 -> 1462 bytes .../res/drawable-xxhdpi/ic_incall_switch_holo_dark.png | Bin 4253 -> 0 bytes InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png | Bin 3153 -> 0 bytes InCallUI/res/drawable-xxhdpi/ic_toolbar_merge.png | Bin 0 -> 1866 bytes InCallUI/res/drawable-xxhdpi/ic_toolbar_swap.png | Bin 0 -> 2035 bytes InCallUI/res/drawable/btn_merge.xml | 4 ++-- InCallUI/res/drawable/btn_swap.xml | 4 ++-- InCallUI/res/layout/extra_button_row.xml | 2 +- 19 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 InCallUI/res/drawable-hdpi/ic_incall_switch_holo_dark.png delete mode 100644 InCallUI/res/drawable-hdpi/ic_merge_holo_dark.png create mode 100644 InCallUI/res/drawable-hdpi/ic_toolbar_merge.png create mode 100644 InCallUI/res/drawable-hdpi/ic_toolbar_swap.png delete mode 100644 InCallUI/res/drawable-mdpi/ic_incall_switch_holo_dark.png delete mode 100644 InCallUI/res/drawable-mdpi/ic_merge_holo_dark.png create mode 100644 InCallUI/res/drawable-mdpi/ic_toolbar_merge.png create mode 100644 InCallUI/res/drawable-mdpi/ic_toolbar_swap.png delete mode 100644 InCallUI/res/drawable-xhdpi/ic_incall_switch_holo_dark.png delete mode 100644 InCallUI/res/drawable-xhdpi/ic_merge_holo_dark.png create mode 100644 InCallUI/res/drawable-xhdpi/ic_toolbar_merge.png create mode 100644 InCallUI/res/drawable-xhdpi/ic_toolbar_swap.png delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_toolbar_merge.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_toolbar_swap.png (limited to 'InCallUI/res') diff --git a/InCallUI/res/drawable-hdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_incall_switch_holo_dark.png deleted file mode 100644 index 429511bff..000000000 Binary files a/InCallUI/res/drawable-hdpi/ic_incall_switch_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_merge_holo_dark.png deleted file mode 100644 index 5069cbe74..000000000 Binary files a/InCallUI/res/drawable-hdpi/ic_merge_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_merge.png b/InCallUI/res/drawable-hdpi/ic_toolbar_merge.png new file mode 100644 index 000000000..d788338bf Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_toolbar_merge.png differ diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_swap.png b/InCallUI/res/drawable-hdpi/ic_toolbar_swap.png new file mode 100644 index 000000000..26a06b814 Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_toolbar_swap.png differ diff --git a/InCallUI/res/drawable-mdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_incall_switch_holo_dark.png deleted file mode 100644 index 5b35ef1c0..000000000 Binary files a/InCallUI/res/drawable-mdpi/ic_incall_switch_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_merge_holo_dark.png deleted file mode 100644 index bd34defc0..000000000 Binary files a/InCallUI/res/drawable-mdpi/ic_merge_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_merge.png b/InCallUI/res/drawable-mdpi/ic_toolbar_merge.png new file mode 100644 index 000000000..312892ebc Binary files /dev/null and b/InCallUI/res/drawable-mdpi/ic_toolbar_merge.png differ diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_swap.png b/InCallUI/res/drawable-mdpi/ic_toolbar_swap.png new file mode 100644 index 000000000..c54a872a7 Binary files /dev/null and b/InCallUI/res/drawable-mdpi/ic_toolbar_swap.png differ diff --git a/InCallUI/res/drawable-xhdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_incall_switch_holo_dark.png deleted file mode 100644 index 9168c32de..000000000 Binary files a/InCallUI/res/drawable-xhdpi/ic_incall_switch_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_merge_holo_dark.png deleted file mode 100644 index 57baa20a1..000000000 Binary files a/InCallUI/res/drawable-xhdpi/ic_merge_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_merge.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_merge.png new file mode 100644 index 000000000..c2ee8e127 Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/ic_toolbar_merge.png differ diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_swap.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_swap.png new file mode 100644 index 000000000..dd1878106 Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/ic_toolbar_swap.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png deleted file mode 100644 index 67c1d7de6..000000000 Binary files a/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png deleted file mode 100644 index a7125afde..000000000 Binary files a/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png and /dev/null differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_merge.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_merge.png new file mode 100644 index 000000000..2dc44d706 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_toolbar_merge.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_swap.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_swap.png new file mode 100644 index 000000000..bb6f5428a Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_toolbar_swap.png differ diff --git a/InCallUI/res/drawable/btn_merge.xml b/InCallUI/res/drawable/btn_merge.xml index 080949ad0..78e19749f 100644 --- a/InCallUI/res/drawable/btn_merge.xml +++ b/InCallUI/res/drawable/btn_merge.xml @@ -21,9 +21,9 @@ - - + \ No newline at end of file diff --git a/InCallUI/res/drawable/btn_swap.xml b/InCallUI/res/drawable/btn_swap.xml index 869b91786..7a8241123 100644 --- a/InCallUI/res/drawable/btn_swap.xml +++ b/InCallUI/res/drawable/btn_swap.xml @@ -21,9 +21,9 @@ - - + \ No newline at end of file diff --git a/InCallUI/res/layout/extra_button_row.xml b/InCallUI/res/layout/extra_button_row.xml index 690186e68..1bff4c550 100644 --- a/InCallUI/res/layout/extra_button_row.xml +++ b/InCallUI/res/layout/extra_button_row.xml @@ -63,7 +63,7 @@