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
---
 .../quantum_ic_exit_to_app_vd_theme_24.xml         | 25 +++++++++++++++++++++
 .../com/android/dialer/theme/res/values/colors.xml |  2 +-
 .../incallui/NewReturnToCallController.java        |  2 +-
 .../newbubble/res/drawable/bubble_pill_up.xml      | 23 +++++++++++++++++++
 .../res/drawable/bubble_ripple_circle_small.xml    | 26 ----------------------
 .../res/drawable/bubble_ripple_pill_up.xml         | 21 +++++++++++++++++
 .../newbubble/res/layout/new_bubble_base.xml       | 14 +++++-------
 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 ++--
 10 files changed, 82 insertions(+), 40 deletions(-)
 create mode 100644 assets/quantum/res/drawable/quantum_ic_exit_to_app_vd_theme_24.xml
 create mode 100644 java/com/android/newbubble/res/drawable/bubble_pill_up.xml
 delete mode 100644 java/com/android/newbubble/res/drawable/bubble_ripple_circle_small.xml
 create mode 100644 java/com/android/newbubble/res/drawable/bubble_ripple_pill_up.xml

diff --git a/assets/quantum/res/drawable/quantum_ic_exit_to_app_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_exit_to_app_vd_theme_24.xml
new file mode 100644
index 000000000..5279f0483
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_exit_to_app_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ 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
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml
index a59fa6704..a43487416 100644
--- a/java/com/android/dialer/theme/res/values/colors.xml
+++ b/java/com/android/dialer/theme/res/values/colors.xml
@@ -72,5 +72,5 @@
   <color name="icon_color_grey">#89000000</color>
 
   <!-- Color for bubble -->
-  <color name="dialer_end_call_button_color">#FFDF0000</color>
+  <color name="dialer_end_call_button_color">#BD2A2A</color>
 </resources>
diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java
index 8f2463e8b..399b18568 100644
--- a/java/com/android/incallui/NewReturnToCallController.java
+++ b/java/com/android/incallui/NewReturnToCallController.java
@@ -280,7 +280,7 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au
     // Return to call
     actions.add(
         Action.builder()
-            .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_fullscreen_vd_theme_24))
+            .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_exit_to_app_vd_theme_24))
             .setIntent(fullScreen)
             .setName(context.getText(R.string.bubble_return_to_call))
             .build());
diff --git a/java/com/android/newbubble/res/drawable/bubble_pill_up.xml b/java/com/android/newbubble/res/drawable/bubble_pill_up.xml
new file mode 100644
index 000000000..9dc0395f4
--- /dev/null
+++ b/java/com/android/newbubble/res/drawable/bubble_pill_up.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">
+  <corners
+      android:topRightRadius="8dp"
+      android:topLeftRadius="8dp"/>
+  <solid android:color="@android:color/white"/>
+</shape>
diff --git a/java/com/android/newbubble/res/drawable/bubble_ripple_circle_small.xml b/java/com/android/newbubble/res/drawable/bubble_ripple_circle_small.xml
deleted file mode 100644
index 109d1cec1..000000000
--- a/java/com/android/newbubble/res/drawable/bubble_ripple_circle_small.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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
-  -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:colorControlHighlight">
-  <item>
-    <shape>
-      <corners android:radius="@dimen/bubble_small_icon_size"/>
-      <solid android:color="@android:color/white"/>
-    </shape>
-  </item>
-</ripple>
diff --git a/java/com/android/newbubble/res/drawable/bubble_ripple_pill_up.xml b/java/com/android/newbubble/res/drawable/bubble_ripple_pill_up.xml
new file mode 100644
index 000000000..77147f828
--- /dev/null
+++ b/java/com/android/newbubble/res/drawable/bubble_ripple_pill_up.xml
@@ -0,0 +1,21 @@
+<?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
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/bubble_ripple_color">
+  <item android:drawable="@drawable/bubble_pill_up"/>
+</ripple>
diff --git a/java/com/android/newbubble/res/layout/new_bubble_base.xml b/java/com/android/newbubble/res/layout/new_bubble_base.xml
index c90cabdf2..8cac982f4 100644
--- a/java/com/android/newbubble/res/layout/new_bubble_base.xml
+++ b/java/com/android/newbubble/res/layout/new_bubble_base.xml
@@ -88,10 +88,10 @@
       tools:visibility="visible">
     <RelativeLayout
         android:id="@+id/bubble_triangle"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
         android:layout_marginTop="7dp"
-        android:layout_marginBottom="-10dp"
+        android:layout_marginBottom="-6dp"
         android:layout_centerHorizontal="true"
         android:background="@color/background_dialer_white"
         android:elevation="@dimen/bubble_expanded_elevation"
@@ -107,15 +107,14 @@
         android:layoutDirection="inherit">
       <com.android.newbubble.NewCheckableButton
           android:id="@+id/bubble_button_full_screen"
-          android:layout_marginTop="@dimen/bubble_radius"
+          android:layout_marginTop="8dp"
           android:textColor="@color/bubble_button_color_grey"
-          android:background="@color/background_dialer_white"
+          android:background="@drawable/bubble_ripple_pill_up"
           android:drawableTint="@color/bubble_button_color_grey"
-          style="@style/CheckableButtonWithSelectableItemBackground"/>
+          style="@style/CheckableButton"/>
       <com.android.newbubble.NewCheckableButton
           android:id="@+id/bubble_button_mute"
           android:layout_below="@id/bubble_button_full_screen"
-          android:layout_marginTop="@dimen/bubble_expanded_separator_height"
           android:textColor="@color/bubble_button_color_grey"
           android:background="@color/background_dialer_white"
           android:drawableTint="@color/bubble_button_color_grey"
@@ -123,7 +122,6 @@
       <com.android.newbubble.NewCheckableButton
           android:id="@+id/bubble_button_audio_route"
           android:layout_below="@id/bubble_button_mute"
-          android:layout_marginTop="@dimen/bubble_expanded_separator_height"
           android:textColor="@color/bubble_button_color_grey"
           android:background="@color/background_dialer_white"
           android:drawableTint="@color/bubble_button_color_grey"
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