Merge "Moving FAB logic to ContactsCommon."
diff --git a/res-common/values/animation_constants.xml b/res-common/values/animation_constants.xml
new file mode 100644
index 0000000..9e59194
--- /dev/null
+++ b/res-common/values/animation_constants.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2014 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>
+ <integer name="floating_action_button_animation_duration">250</integer>
+</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 080a032..360a992 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -106,6 +106,8 @@
<dimen name="floating_action_button_margin_right">16dp</dimen>
<!-- Bottom margin of the floating action button -->
<dimen name="floating_action_button_margin_bottom">16dp</dimen>
+ <!-- Offset of bottom margin of the floating action button used when dialpad is up -->
+ <dimen name="floating_action_button_dialpad_margin_bottom_offset">4dp</dimen>
<!-- Height of the selection indicator of a tab. -->
<dimen name="tab_selected_underline_height">3dp</dimen>