commit 35eefad58f34831a96b7891d3e5dc869b4d634d0
author Yorke Lee <yorkelee@google.com> Fri Sep 05 00:20:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 00:20:51 2014 +0000
tree 480431216d5f66f97cd12f851622411e96e78de2
parent c0a9d748d6c1724405ba2e6c262e6475e67bba4f
parent 9a598ebb26f7d12b681847cdd56c05ff83558933

Merge "Follow ContactsContract API changes" into lmp-dev

src/com/android/contacts/common/CallUtil.java

diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index ea53571..307c975 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -36,6 +36,7 @@
     public static final String SCHEME_MAILTO = "mailto";
     public static final String SCHEME_IMTO = "imto";
     public static final String SCHEME_SIP = "sip";
+    public static final String SCHEME_VOICEMAIL = "voicemail";
 
     /**
      * Return an Intent for making a phone call. Scheme (e.g. tel, sip) will be determined

src/com/android/contacts/common/widget/FloatingActionButtonController.java

diff --git a/src/com/android/contacts/common/widget/FloatingActionButtonController.java b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
index 773e024..679eb7b 100644
--- a/src/com/android/contacts/common/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
@@ -34,8 +34,9 @@
     public static final int ALIGN_QUARTER_END = 1;
     public static final int ALIGN_END = 2;
 
-    private static final int FAB_FADE_DURATION = 266;
-    private static final int FAB_FADE_IN_DELAY = 100;
+    private static final int FAB_SCALE_IN_DURATION = 266;
+    private static final int FAB_SCALE_IN_FADE_IN_DELAY = 100;
+    private static final int FAB_ICON_FADE_OUT_DURATION = 66;
 
     private final int mAnimationDuration;
     private final int mFloatingActionButtonWidth;
@@ -138,10 +139,13 @@
     /**
      * Scales the floating action button from no height and width to its actual dimensions. This is
      * an animation for showing the floating action button.
+     * @param delayMs The delay for the effect, in milliseconds.
      */
-    public void scaleIn() {
-        AnimUtils.scaleIn(mFloatingActionButtonContainer, mAnimationDuration);
-        AnimUtils.fadeIn(mFloatingActionButton, FAB_FADE_DURATION, FAB_FADE_IN_DELAY, null);
+    public void scaleIn(int delayMs) {
+        setVisible(true);
+        AnimUtils.scaleIn(mFloatingActionButtonContainer, FAB_SCALE_IN_DURATION, delayMs);
+        AnimUtils.fadeIn(mFloatingActionButton, FAB_SCALE_IN_DURATION,
+                delayMs + FAB_SCALE_IN_FADE_IN_DELAY, null);
     }
 
     /**
@@ -150,6 +154,9 @@
      */
     public void scaleOut() {
         AnimUtils.scaleOut(mFloatingActionButtonContainer, mAnimationDuration);
+        // Fade out the icon faster than the scale out animation, so that the icon scaling is less
+        // obvious. We don't want it to scale, but the resizing the container is not as performant.
+        AnimUtils.fadeOut(mFloatingActionButton, FAB_ICON_FADE_OUT_DURATION, null);
     }
 
     /**
@@ -182,17 +189,6 @@
         return result;
     }
 
-    /**
-     * Manually translates the FAB without animation.
-     *
-     * @param translationX The x distance to translate.
-     * @param translationY The y distance to translate.
-     */
-    public void manuallyTranslate(int translationX, int translationY) {
-        mFloatingActionButtonContainer.setTranslationX(translationX);
-        mFloatingActionButtonContainer.setTranslationY(translationY);
-    }
-
     private boolean isLayoutRtl() {
         return mFloatingActionButtonContainer.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
     }