From 84ac49babc81c94357706c5073fdb89f27b5fdbd Mon Sep 17 00:00:00 2001
From: yueg <yueg@google.com>
Date: Wed, 1 Nov 2017 16:22:28 -0700
Subject: 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
---
 java/com/android/newbubble/res/values/colors.xml |  7 ++---
 java/com/android/newbubble/res/values/styles.xml | 38 ++++++++++++++++++++++++
 java/com/android/newbubble/res/values/values.xml | 14 ++++++---
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 java/com/android/newbubble/res/values/styles.xml

(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 556d8bd95..8b1294fc6 100644
--- a/java/com/android/newbubble/res/values/colors.xml
+++ b/java/com/android/newbubble/res/values/colors.xml
@@ -18,8 +18,7 @@
 <resources>
   <color name="bubble_primary_background_darken">#33000000</color>
 
-  <color name="bubble_button_text_color_black">@color/dialer_primary_text_color</color>
-  <color name="bubble_button_text_color_white">@color/dialer_primary_text_color_white</color>
-  <color name="bubble_button_text_color_blue">@color/dialer_theme_color</color>
-  <color name="bubble_end_call_button_background">@color/dialer_end_call_button_color</color>
+  <color name="bubble_button_color_grey">@color/dialer_secondary_text_color</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
new file mode 100644
index 000000000..274bd8704
--- /dev/null
+++ b/java/com/android/newbubble/res/values/styles.xml
@@ -0,0 +1,38 @@
+<?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
+  -->
+
+<resources>
+  <style name="CheckableButton">
+    <item name="android:layout_width">@dimen/bubble_expanded_width</item>
+    <item name="android:layout_height">wrap_content</item>
+
+    <item name="android:paddingTop">@dimen/bubble_button_padding_vertical</item>
+    <item name="android:paddingBottom">@dimen/bubble_button_padding_vertical</item>
+    <item name="android:paddingStart">@dimen/bubble_button_padding_horizontal</item>
+    <item name="android:paddingEnd">@dimen/bubble_button_padding_horizontal</item>
+    <item name="android:drawablePadding">@dimen/bubble_icon_padding</item>
+  </style>
+
+  <style name="SelectableItemTheme">
+    <item name="colorControlHighlight">@color/dialer_secondary_text_color_hiden</item>
+  </style>
+  <style name="CheckableButtonWithSelectableItemBackground" parent="CheckableButton">
+    <item name="android:theme">@style/SelectableItemTheme</item>
+    <item name="android:foreground">?attr/selectableItemBackground</item>
+
+  </style>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/newbubble/res/values/values.xml b/java/com/android/newbubble/res/values/values.xml
index 381b0079e..d8cd08f87 100644
--- a/java/com/android/newbubble/res/values/values.xml
+++ b/java/com/android/newbubble/res/values/values.xml
@@ -18,17 +18,23 @@
 <resources>
   <dimen name="bubble_size">56dp</dimen>
   <dimen name="bubble_icon_padding">16dp</dimen>
-  <dimen name="bubble_move_elevation_change">4dp</dimen>
+  <dimen name="bubble_move_elevation_change">6dp</dimen>
 
+  <dimen name="bubble_button_height">36dp</dimen>
   <dimen name="bubble_button_icon_padding">16dp</dimen>
-  <dimen name="bubble_safe_margin_horizontal">-4dp</dimen>
+  <dimen name="bubble_button_padding_vertical">12dp</dimen>
+  <dimen name="bubble_button_padding_horizontal">16dp</dimen>
+  <dimen name="bubble_safe_margin_horizontal">-16dp</dimen>
   <dimen name="bubble_safe_margin_vertical">64dp</dimen>
   <dimen name="bubble_shadow_padding_size_vertical">16dp</dimen>
+  <dimen name="bubble_shadow_padding_size_vertical_minus">-16dp</dimen>
   <dimen name="bubble_shadow_padding_size_horizontal">12dp</dimen>
+  <dimen name="bubble_shadow_padding_size_horizontal_double">24dp</dimen>
 
-  <dimen name="bubble_elevation">10dp</dimen>
+  <dimen name="bubble_elevation">6dp</dimen>
+  <dimen name="bubble_expanded_elevation">8dp</dimen>
   <dimen name="bubble_expanded_width">160dp</dimen>
-  <dimen name="bubble_radius">20dp</dimen>
+  <dimen name="bubble_radius">12dp</dimen>
   <dimen name="bubble_expanded_separator_height">4dp</dimen>
   <dimen name="bubble_small_icon_size">24dp</dimen>
   <dimen name="bubble_small_icon_padding">4dp</dimen>
-- 
cgit v1.2.3