summaryrefslogtreecommitdiff
path: root/java/com/android/newbubble/res/drawable
diff options
context:
space:
mode:
authoryueg <yueg@google.com>2017-11-01 16:22:28 -0700
committerzachh <zachh@google.com>2017-11-10 23:40:48 +0000
commit84ac49babc81c94357706c5073fdb89f27b5fdbd (patch)
tree4e92d59fcb444de033bc359928e2fce120118adb /java/com/android/newbubble/res/drawable
parent65e19075682f3c0cdaca367138560d80ac4a3106 (diff)
Implement some UI changes.
Including: - merge end call button with other buttons - add ripple effect for buttons - adjust elevation according to material design guide - add triangle in expanded view Bug: 67605985 Test: manual PiperOrigin-RevId: 174253861 Change-Id: I7b5315245a322235efb39a9cda26b8686cc7bbf9
Diffstat (limited to 'java/com/android/newbubble/res/drawable')
-rw-r--r--java/com/android/newbubble/res/drawable/bubble_pill_down.xml (renamed from java/com/android/newbubble/res/drawable/bubble_ripple_circle.xml)15
-rw-r--r--java/com/android/newbubble/res/drawable/bubble_shape_circle.xml25
-rw-r--r--java/com/android/newbubble/res/drawable/bubble_shape_circle_small.xml23
3 files changed, 54 insertions, 9 deletions
diff --git a/java/com/android/newbubble/res/drawable/bubble_ripple_circle.xml b/java/com/android/newbubble/res/drawable/bubble_pill_down.xml
index 8d5cf0bb5..721e6fc52 100644
--- a/java/com/android/newbubble/res/drawable/bubble_ripple_circle.xml
+++ b/java/com/android/newbubble/res/drawable/bubble_pill_down.xml
@@ -15,12 +15,9 @@
~ limitations under the License
-->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="?android:colorControlHighlight">
- <item>
- <shape>
- <corners android:radius="@dimen/bubble_size"/>
- <solid android:color="@android:color/white"/>
- </shape>
- </item>
-</ripple>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners
+ android:bottomRightRadius="@dimen/bubble_radius"
+ android:bottomLeftRadius="@dimen/bubble_radius"/>
+ <solid android:color="@android:color/white"/>
+</shape>
diff --git a/java/com/android/newbubble/res/drawable/bubble_shape_circle.xml b/java/com/android/newbubble/res/drawable/bubble_shape_circle.xml
new file mode 100644
index 000000000..af9d8589b
--- /dev/null
+++ b/java/com/android/newbubble/res/drawable/bubble_shape_circle.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners
+ android:bottomRightRadius="@dimen/bubble_size"
+ android:topRightRadius="@dimen/bubble_size"
+ android:bottomLeftRadius="@dimen/bubble_size"
+ android:topLeftRadius="@dimen/bubble_size"/>
+ <solid android:color="@android:color/white"/>
+</shape>
diff --git a/java/com/android/newbubble/res/drawable/bubble_shape_circle_small.xml b/java/com/android/newbubble/res/drawable/bubble_shape_circle_small.xml
new file mode 100644
index 000000000..73b9cf338
--- /dev/null
+++ b/java/com/android/newbubble/res/drawable/bubble_shape_circle_small.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+ <solid android:color="@android:color/white"/>
+ <size android:width="@dimen/bubble_small_icon_size"
+ android:height="@dimen/bubble_small_icon_size"/>
+</shape>