summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-05-09 14:44:00 -0700
committerAndrew Lee <anwlee@google.com>2014-05-09 14:44:02 -0700
commit56021c74461fef9783cfc853afdac96e7b7a3bdf (patch)
treec02cb30038c7e427cb21cdaf3b66d0cf99b76d91 /InCallUI
parent4469dd824041c0efbc32bbae373d00dbf08b6697 (diff)
Change icon and background for end call button.
Not removing end call icon yet; will after removing icon from the glowpad for the incoming call. Bug: 14108639 Change-Id: I0b7fd29dd3bb9b0d6204c85fec1379c3211ec483
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/drawable-hdpi/fab_ic_end_call.pngbin0 -> 852 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/fab_red_background.pngbin0 -> 2227 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/fab_ic_end_call.pngbin0 -> 668 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/fab_red_background.pngbin0 -> 1511 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/fab_ic_end_call.pngbin0 -> 1215 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/fab_red_background.pngbin0 -> 3248 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/fab_ic_end_call.pngbin0 -> 2227 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/fab_red_background.pngbin0 -> 5545 bytes
-rw-r--r--InCallUI/res/drawable/floating_end_button_compound_background.xml2
-rw-r--r--InCallUI/res/layout/call_card.xml2
10 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/res/drawable-hdpi/fab_ic_end_call.png b/InCallUI/res/drawable-hdpi/fab_ic_end_call.png
new file mode 100644
index 000000000..b7f54d3bb
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/fab_ic_end_call.png
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/fab_red_background.png b/InCallUI/res/drawable-hdpi/fab_red_background.png
new file mode 100644
index 000000000..819bab58a
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/fab_red_background.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/fab_ic_end_call.png b/InCallUI/res/drawable-mdpi/fab_ic_end_call.png
new file mode 100644
index 000000000..76ce3973d
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/fab_ic_end_call.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/fab_red_background.png b/InCallUI/res/drawable-mdpi/fab_red_background.png
new file mode 100644
index 000000000..091a1fcda
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/fab_red_background.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/fab_ic_end_call.png b/InCallUI/res/drawable-xhdpi/fab_ic_end_call.png
new file mode 100644
index 000000000..1c95e175a
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/fab_ic_end_call.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/fab_red_background.png b/InCallUI/res/drawable-xhdpi/fab_red_background.png
new file mode 100644
index 000000000..f6f283438
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/fab_red_background.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/fab_ic_end_call.png b/InCallUI/res/drawable-xxhdpi/fab_ic_end_call.png
new file mode 100644
index 000000000..37e826402
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/fab_ic_end_call.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/fab_red_background.png b/InCallUI/res/drawable-xxhdpi/fab_red_background.png
new file mode 100644
index 000000000..46afeac10
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/fab_red_background.png
Binary files differ
diff --git a/InCallUI/res/drawable/floating_end_button_compound_background.xml b/InCallUI/res/drawable/floating_end_button_compound_background.xml
index 2f2ad7921..433545b84 100644
--- a/InCallUI/res/drawable/floating_end_button_compound_background.xml
+++ b/InCallUI/res/drawable/floating_end_button_compound_background.xml
@@ -20,5 +20,5 @@
android:drawable="@drawable/floating_end_button_disabled_background" />
<item android:state_pressed="true"
android:drawable="@drawable/floating_end_button_pressed_background" />
- <item android:drawable="@drawable/floating_end_button_active_background" />
+ <item android:drawable="@drawable/fab_red_background" />
</selector>
diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml
index 6a06cabd0..91ee1c629 100644
--- a/InCallUI/res/layout/call_card.xml
+++ b/InCallUI/res/layout/call_card.xml
@@ -100,7 +100,7 @@
android:layout_height="@dimen/floating_action_button_height"
android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
android:background="@drawable/floating_end_button_compound_background"
- android:src="@drawable/ic_in_call_phone_hangup"
+ android:src="@drawable/fab_ic_end_call"
android:contentDescription="@string/onscreenEndCallText" />
</FrameLayout>