summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-09-13 11:30:23 -0700
committerChristine Chen <christinech@google.com>2013-09-13 11:31:09 -0700
commitea31bb88727e214280639ea52a4fb8bcff52c622 (patch)
tree2ae748c632740ec6faf8b25f6b885c36db567967
parentae7610fc14a767dc4f69aa39ee3fc464341037d7 (diff)
Changes how end call button looks
Bug: 10491107 Change-Id: Ia8b93314d51ba1133447ba1a8ec00e36853ead02
-rw-r--r--InCallUI/res/drawable-hdpi/ic_dial_end_call.pngbin3189 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/ic_end_call_holo_dark.pngbin1974 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.pngbin0 -> 1794 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/ic_dial_end_call.pngbin2484 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/ic_end_call_holo_dark.pngbin1471 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/ic_in_call_phone_hangup.pngbin0 -> 1280 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/ic_dial_end_call.pngbin4593 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/ic_end_call_holo_dark.pngbin2704 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/ic_in_call_phone_hangup.pngbin0 -> 2378 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/ic_dial_end_call.pngbin4504 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.pngbin2939 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/ic_in_call_phone_hangup.pngbin0 -> 2698 bytes
-rw-r--r--InCallUI/res/layout/call_button_fragment.xml2
-rw-r--r--InCallUI/res/layout/caller_in_conference.xml2
14 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_dial_end_call.png b/InCallUI/res/drawable-hdpi/ic_dial_end_call.png
deleted file mode 100644
index ab3adb443..000000000
--- a/InCallUI/res/drawable-hdpi/ic_dial_end_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_end_call_holo_dark.png
deleted file mode 100644
index 0f373bb26..000000000
--- a/InCallUI/res/drawable-hdpi/ic_end_call_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png
new file mode 100644
index 000000000..d6f26f22c
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_in_call_phone_hangup.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_dial_end_call.png b/InCallUI/res/drawable-mdpi/ic_dial_end_call.png
deleted file mode 100644
index c47664226..000000000
--- a/InCallUI/res/drawable-mdpi/ic_dial_end_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_end_call_holo_dark.png
deleted file mode 100644
index e090cc806..000000000
--- a/InCallUI/res/drawable-mdpi/ic_end_call_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-mdpi/ic_in_call_phone_hangup.png
new file mode 100644
index 000000000..1dfad3b8f
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_in_call_phone_hangup.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_dial_end_call.png b/InCallUI/res/drawable-xhdpi/ic_dial_end_call.png
deleted file mode 100644
index c24ec9872..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_dial_end_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_end_call_holo_dark.png
deleted file mode 100644
index f64f5e3d9..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_end_call_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-xhdpi/ic_in_call_phone_hangup.png
new file mode 100644
index 000000000..1d1bfebfe
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_in_call_phone_hangup.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png b/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png
deleted file mode 100644
index 5b350225d..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png
deleted file mode 100644
index da3b0750b..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_phone_hangup.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_phone_hangup.png
new file mode 100644
index 000000000..67d8ad261
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_in_call_phone_hangup.png
Binary files differ
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 2174a9700..06de6d9fa 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -51,7 +51,7 @@
<ImageButton android:id="@+id/endButton"
style="@style/InCallEndButton"
android:layout_width="match_parent"
- android:src="@drawable/ic_dial_end_call"
+ android:src="@drawable/ic_in_call_phone_hangup"
android:background="@drawable/end_call_background"
android:contentDescription="@string/onscreenEndCallText"/>
diff --git a/InCallUI/res/layout/caller_in_conference.xml b/InCallUI/res/layout/caller_in_conference.xml
index c2c68c836..924bc6305 100644
--- a/InCallUI/res/layout/caller_in_conference.xml
+++ b/InCallUI/res/layout/caller_in_conference.xml
@@ -99,7 +99,7 @@
android:id="@+id/conferenceCallerDisconnect"
android:layout_width="80dp"
android:layout_height="match_parent"
- android:src="@drawable/ic_end_call_holo_dark"
+ android:src="@drawable/ic_in_call_phone_hangup"
android:background="@drawable/end_call_background"
android:scaleType="center"
android:contentDescription="@string/onscreenEndCallText" />