From 3dcd8ea9c7aa95b76711095f612dbc52958bf6a6 Mon Sep 17 00:00:00 2001
From: yueg <yueg@google.com>
Date: Wed, 22 Nov 2017 11:07:44 -0800
Subject: Bubble v2 UI changes.

Including:
- Use exit-to-app icon instead of fullscreen icon for back-to-call button
- Use ripple for first button since it needs top-rounded background
- Change red hang-up button color and grey icon and text color
- Change some dimensions
Bug: 67605985
Test: manual
PiperOrigin-RevId: 176678427
Change-Id: I3f7836d832f7130f82d7f3764fb392807f3fab9a
---
 java/com/android/newbubble/res/values/colors.xml | 3 ++-
 java/com/android/newbubble/res/values/styles.xml | 2 +-
 java/com/android/newbubble/res/values/values.xml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'java/com/android/newbubble/res/values')

diff --git a/java/com/android/newbubble/res/values/colors.xml b/java/com/android/newbubble/res/values/colors.xml
index 8b1294fc6..74ad85cea 100644
--- a/java/com/android/newbubble/res/values/colors.xml
+++ b/java/com/android/newbubble/res/values/colors.xml
@@ -18,7 +18,8 @@
 <resources>
   <color name="bubble_primary_background_darken">#33000000</color>
 
-  <color name="bubble_button_color_grey">@color/dialer_secondary_text_color</color>
+  <color name="bubble_ripple_color">@color/bubble_primary_background_darken</color>
+  <color name="bubble_button_color_grey">@color/icon_color_grey</color>
   <color name="bubble_button_color_white">@color/dialer_primary_text_color_white</color>
   <color name="bubble_button_color_blue">@color/dialer_theme_color</color>
 </resources>
diff --git a/java/com/android/newbubble/res/values/styles.xml b/java/com/android/newbubble/res/values/styles.xml
index 274bd8704..6c138d645 100644
--- a/java/com/android/newbubble/res/values/styles.xml
+++ b/java/com/android/newbubble/res/values/styles.xml
@@ -28,7 +28,7 @@
   </style>
 
   <style name="SelectableItemTheme">
-    <item name="colorControlHighlight">@color/dialer_secondary_text_color_hiden</item>
+    <item name="colorControlHighlight">@color/bubble_ripple_color</item>
   </style>
   <style name="CheckableButtonWithSelectableItemBackground" parent="CheckableButton">
     <item name="android:theme">@style/SelectableItemTheme</item>
diff --git a/java/com/android/newbubble/res/values/values.xml b/java/com/android/newbubble/res/values/values.xml
index a028254c7..6dda61d6c 100644
--- a/java/com/android/newbubble/res/values/values.xml
+++ b/java/com/android/newbubble/res/values/values.xml
@@ -34,8 +34,8 @@
   <dimen name="bubble_elevation">6dp</dimen>
   <dimen name="bubble_expanded_elevation">8dp</dimen>
   <dimen name="bubble_expanded_width">160dp</dimen>
-  <dimen name="bubble_radius">12dp</dimen>
-  <dimen name="bubble_expanded_separator_height">4dp</dimen>
+  <dimen name="bubble_radius">16dp</dimen>
+  <dimen name="bubble_expanded_separator_height">8dp</dimen>
   <dimen name="bubble_small_icon_size">24dp</dimen>
   <dimen name="bubble_small_icon_padding">4dp</dimen>
 </resources>
-- 
cgit v1.2.3