summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-07-31 14:54:06 -0700
committerYorke Lee <yorkelee@google.com>2014-07-31 14:58:43 -0700
commitaed88a6b2f536cf09e68c1315732207a1b59a735 (patch)
tree6e7105fa6b16007b0ff05c24ee0b4c0c54d10f0b
parent49e24bf10151b64a55cc8d5d4727e27b752e07bc (diff)
Swap out FAB background
Bug: 16353999 Change-Id: I1b9895ada47c307dafdbf7457e84f2e631e27607
-rw-r--r--InCallUI/res/drawable-hdpi/fab_blue.pngbin0 -> 2805 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/fab_red.pngbin0 -> 2783 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/fab_red_background.pngbin2227 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-hdpi/fab_teal_background.pngbin2233 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/fab_blue.pngbin0 -> 1841 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/fab_red.pngbin0 -> 1843 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/fab_red_background.pngbin1511 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-mdpi/fab_teal_background.pngbin1508 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/fab_blue.pngbin0 -> 4085 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/fab_red.pngbin0 -> 4047 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/fab_red_background.pngbin3248 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xhdpi/fab_teal_background.pngbin3304 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/fab_blue.pngbin0 -> 7009 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/fab_red.pngbin0 -> 6965 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/fab_red_background.pngbin5545 -> 0 bytes
-rw-r--r--InCallUI/res/drawable-xxhdpi/fab_teal_background.pngbin5154 -> 0 bytes
-rw-r--r--InCallUI/res/drawable/end_call_background.xml2
-rw-r--r--InCallUI/res/drawable/ic_incall_audio_handle.xml2
-rw-r--r--InCallUI/res/drawable/ic_incall_video_handle.xml2
-rw-r--r--InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml2
-rw-r--r--InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml2
-rw-r--r--InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml2
22 files changed, 6 insertions, 6 deletions
diff --git a/InCallUI/res/drawable-hdpi/fab_blue.png b/InCallUI/res/drawable-hdpi/fab_blue.png
new file mode 100644
index 000000000..8ff3d2918
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/fab_blue.png
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/fab_red.png b/InCallUI/res/drawable-hdpi/fab_red.png
new file mode 100644
index 000000000..497cc7916
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/fab_red.png
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/fab_red_background.png b/InCallUI/res/drawable-hdpi/fab_red_background.png
deleted file mode 100644
index 819bab58a..000000000
--- a/InCallUI/res/drawable-hdpi/fab_red_background.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-hdpi/fab_teal_background.png b/InCallUI/res/drawable-hdpi/fab_teal_background.png
deleted file mode 100644
index 88e849596..000000000
--- a/InCallUI/res/drawable-hdpi/fab_teal_background.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/fab_blue.png b/InCallUI/res/drawable-mdpi/fab_blue.png
new file mode 100644
index 000000000..2ca6b4bdf
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/fab_blue.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/fab_red.png b/InCallUI/res/drawable-mdpi/fab_red.png
new file mode 100644
index 000000000..c9e76a057
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/fab_red.png
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/fab_red_background.png b/InCallUI/res/drawable-mdpi/fab_red_background.png
deleted file mode 100644
index 091a1fcda..000000000
--- a/InCallUI/res/drawable-mdpi/fab_red_background.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-mdpi/fab_teal_background.png b/InCallUI/res/drawable-mdpi/fab_teal_background.png
deleted file mode 100644
index 3a37b274b..000000000
--- a/InCallUI/res/drawable-mdpi/fab_teal_background.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/fab_blue.png b/InCallUI/res/drawable-xhdpi/fab_blue.png
new file mode 100644
index 000000000..300b07eb4
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/fab_blue.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/fab_red.png b/InCallUI/res/drawable-xhdpi/fab_red.png
new file mode 100644
index 000000000..373e49e8f
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/fab_red.png
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/fab_red_background.png b/InCallUI/res/drawable-xhdpi/fab_red_background.png
deleted file mode 100644
index f6f283438..000000000
--- a/InCallUI/res/drawable-xhdpi/fab_red_background.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xhdpi/fab_teal_background.png b/InCallUI/res/drawable-xhdpi/fab_teal_background.png
deleted file mode 100644
index b2ed8cddb..000000000
--- a/InCallUI/res/drawable-xhdpi/fab_teal_background.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/fab_blue.png b/InCallUI/res/drawable-xxhdpi/fab_blue.png
new file mode 100644
index 000000000..76d68ac6a
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/fab_blue.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/fab_red.png b/InCallUI/res/drawable-xxhdpi/fab_red.png
new file mode 100644
index 000000000..92eb979d5
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/fab_red.png
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/fab_red_background.png b/InCallUI/res/drawable-xxhdpi/fab_red_background.png
deleted file mode 100644
index 46afeac10..000000000
--- a/InCallUI/res/drawable-xxhdpi/fab_red_background.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable-xxhdpi/fab_teal_background.png b/InCallUI/res/drawable-xxhdpi/fab_teal_background.png
deleted file mode 100644
index 6bb4d2010..000000000
--- a/InCallUI/res/drawable-xxhdpi/fab_teal_background.png
+++ /dev/null
Binary files differ
diff --git a/InCallUI/res/drawable/end_call_background.xml b/InCallUI/res/drawable/end_call_background.xml
index db1bd7365..b3d877b31 100644
--- a/InCallUI/res/drawable/end_call_background.xml
+++ b/InCallUI/res/drawable/end_call_background.xml
@@ -17,5 +17,5 @@
<!-- Background drawable used to render the "end call" button. -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/end_call_touch_feedback_tint">
- <item android:drawable="@drawable/fab_red_background" />
+ <item android:drawable="@drawable/fab_red" />
</ripple>
diff --git a/InCallUI/res/drawable/ic_incall_audio_handle.xml b/InCallUI/res/drawable/ic_incall_audio_handle.xml
index fd40e517c..2e71a5b70 100644
--- a/InCallUI/res/drawable/ic_incall_audio_handle.xml
+++ b/InCallUI/res/drawable/ic_incall_audio_handle.xml
@@ -25,7 +25,7 @@
<layer-list>
<item>
<bitmap
- android:src="@drawable/fab_teal_background"
+ android:src="@drawable/fab_blue"
android:tint="@color/glowpad_incoming_widget_background_tint" />
</item>
<item>
diff --git a/InCallUI/res/drawable/ic_incall_video_handle.xml b/InCallUI/res/drawable/ic_incall_video_handle.xml
index 80636afec..a24e305c4 100644
--- a/InCallUI/res/drawable/ic_incall_video_handle.xml
+++ b/InCallUI/res/drawable/ic_incall_video_handle.xml
@@ -26,7 +26,7 @@
<layer-list>
<item>
<bitmap
- android:src="@drawable/fab_teal_background"
+ android:src="@drawable/fab_blue"
android:tint="@color/glowpad_incoming_widget_background_tint" />
</item>
<item>
diff --git a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml
index b49d1dfd7..dd227d5a0 100644
--- a/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_answer_activated_layer.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/fab_teal_background" />
+ <item android:drawable="@drawable/fab_blue" />
<item>
<bitmap
android:gravity="center"
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 3cb769223..57a3c09d8 100644
--- a/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_answer_video_activated_layer.xml
@@ -15,7 +15,7 @@
~ limitations under the License
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/fab_teal_background" />
+ <item android:drawable="@drawable/fab_blue" />
<item>
<bitmap
android:gravity="center"
diff --git a/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml b/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml
index 6bddf9850..096c32b4a 100644
--- a/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml
+++ b/InCallUI/res/drawable/ic_lockscreen_decline_activated_layer.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/fab_red_background" />
+ <item android:drawable="@drawable/fab_red" />
<item>
<bitmap
android:gravity="center"