diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-14 17:47:48 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-08-15 17:33:01 -0700 |
commit | 45c0059f18883ebda7133d92f5828b5859d22934 (patch) | |
tree | ce3ad205eb5eca2310afe95ae43a0783abf48088 /InCallUI/res/values | |
parent | d3bbf5e13fe245fd178106c006225b975be0bcef (diff) |
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
Diffstat (limited to 'InCallUI/res/values')
-rw-r--r-- | InCallUI/res/values/colors.xml | 4 | ||||
-rw-r--r-- | InCallUI/res/values/dimens.xml | 7 |
2 files changed, 8 insertions, 3 deletions
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> |