diff options
Diffstat (limited to 'InCallUI')
19 files changed, 5 insertions, 5 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_incall_switch_holo_dark.png Binary files differdeleted file mode 100644 index 429511bff..000000000 --- a/InCallUI/res/drawable-hdpi/ic_incall_switch_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_merge_holo_dark.png Binary files differdeleted file mode 100644 index 5069cbe74..000000000 --- a/InCallUI/res/drawable-hdpi/ic_merge_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_merge.png b/InCallUI/res/drawable-hdpi/ic_toolbar_merge.png Binary files differnew file mode 100644 index 000000000..d788338bf --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_merge.png diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_swap.png b/InCallUI/res/drawable-hdpi/ic_toolbar_swap.png Binary files differnew file mode 100644 index 000000000..26a06b814 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_swap.png diff --git a/InCallUI/res/drawable-mdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_incall_switch_holo_dark.png Binary files differdeleted file mode 100644 index 5b35ef1c0..000000000 --- a/InCallUI/res/drawable-mdpi/ic_incall_switch_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_merge_holo_dark.png Binary files differdeleted file mode 100644 index bd34defc0..000000000 --- a/InCallUI/res/drawable-mdpi/ic_merge_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_merge.png b/InCallUI/res/drawable-mdpi/ic_toolbar_merge.png Binary files differnew file mode 100644 index 000000000..312892ebc --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_merge.png diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_swap.png b/InCallUI/res/drawable-mdpi/ic_toolbar_swap.png Binary files differnew file mode 100644 index 000000000..c54a872a7 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_swap.png diff --git a/InCallUI/res/drawable-xhdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_incall_switch_holo_dark.png Binary files differdeleted file mode 100644 index 9168c32de..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_incall_switch_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_merge_holo_dark.png Binary files differdeleted file mode 100644 index 57baa20a1..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_merge_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_merge.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_merge.png Binary files differnew file mode 100644 index 000000000..c2ee8e127 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_merge.png diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_swap.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_swap.png Binary files differnew file mode 100644 index 000000000..dd1878106 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_swap.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png Binary files differdeleted file mode 100644 index 67c1d7de6..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png Binary files differdeleted file mode 100644 index a7125afde..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_merge.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_merge.png Binary files differnew file mode 100644 index 000000000..2dc44d706 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_merge.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_swap.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_swap.png Binary files differnew file mode 100644 index 000000000..bb6f5428a --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_swap.png 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 @@ <item android:drawable="@drawable/btn_background" /> <item> - <bitmap android:src="@drawable/ic_merge_holo_dark" + <bitmap android:src="@drawable/ic_toolbar_merge" android:gravity="center" android:tint="@color/selectable_icon_tint" /> </item> - + </layer-list>
\ 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 @@ <item android:drawable="@drawable/btn_background" /> <item> - <bitmap android:src="@drawable/ic_incall_switch_holo_dark" + <bitmap android:src="@drawable/ic_toolbar_swap" android:gravity="center" android:tint="@color/selectable_icon_tint" /> </item> - + </layer-list>
\ 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 @@ <ImageButton android:id="@+id/cdmaMergeButtonImage" android:clickable="false" style="@style/InCallExtraRowButton" - android:src="@drawable/ic_merge_holo_dark" + android:src="@drawable/ic_toolbar_merge" android:contentDescription="@string/onscreenMergeCallsText" /> <TextView android:id="@+id/cdmaMergeButtonLabel" style="@style/InCallExtraRowButtonLabel" |
