From 45c0059f18883ebda7133d92f5828b5859d22934 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Thu, 14 Aug 2014 17:47:48 -0700
Subject: Position/size adjustments to the floating action button.

+ Use new theme color for dialpad tints.
+ Translate FAB higher and make it 128% scaled in InCallUI.
+ Add methods so that dialpad is shown/hidden, FAB transitions
to/from its normal position and normal scale.
+ Translate button in/out when enabled/disabled.

Bug: 16399233
Change-Id: Ia8f56f494a89927c25657a75cfcca147c34c6c98
---
 InCallUI/res/values/colors.xml | 4 ++--
 InCallUI/res/values/dimens.xml | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'InCallUI/res/values')

diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml
index faf27e676..bd2642d64 100644
--- a/InCallUI/res/values/colors.xml
+++ b/InCallUI/res/values/colors.xml
@@ -67,6 +67,6 @@
     <color name="glowpad_incoming_widget_tint">#a3a3a3</color>
     <color name="glowpad_incoming_widget_background_tint">#ffffff</color>
 
-    <!-- 30% opacity, accent color. -->
-    <color name="incall_dialpad_touch_tint">#66eeff41</color>
+    <!-- 20% opacity, theme color. -->
+    <color name="incall_dialpad_touch_tint">#330288d1</color>
 </resources>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index f35a3f3d8..87dd66756 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -59,6 +59,7 @@
     <dimen name="primary_call_elevation">4dp</dimen>
     <dimen name="secondary_call_elevation">4dp</dimen>
 
+    <dimen name="floating_action_bar_vertical_offset">-24dp</dimen>
 
     <!-- Padding at the left and right edges of the incall_touch_ui button
          cluster.  This padding is necessary because we can't allow the
@@ -102,7 +103,7 @@
     <dimen name="translucent_shadow_height">2dp</dimen>
 
     <dimen name="end_call_button_margin_bottom">8dp</dimen>
-    <dimen name="end_call_button_hide_offset">70dp</dimen>
+    <dimen name="end_call_button_hide_offset">80dp</dimen>
 
     <dimen name="call_card_anim_translate_y_offset">50dp</dimen>
 
@@ -111,4 +112,8 @@
     <dimen name="video_preview_small_dimension">90dp</dimen>
 
     <dimen name="video_preview_margin">20dp</dimen>
+
+    <dimen name="end_call_floating_action_button_diameter">72dp</dimen>
+    <dimen name="end_call_floating_action_button_small_diameter">56dp</dimen>
+
 </resources>
-- 
cgit v1.2.3