commit 1ba6903ab696d9eeb1117fefb423b5b3bdba2131
author Andrew Lee <anwlee@google.com> Fri Jun 26 23:21:54 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 26 23:21:55 2015 +0000
tree 8758863b6478fa9046188fedea362790b7bbb12f
parent dd035aadc70fbd44d3fa799d507498db50344746
parent d01d238a7e6ff30d6d025eee96e41a8a0c511691

Merge "Remove isVisibility check before scaleIn." into mnc-dev

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 31f44af..eb69d3c 100644
--- a/src/com/android/contacts/common/widget/FloatingActionButtonController.java
+++ b/src/com/android/contacts/common/widget/FloatingActionButtonController.java
@@ -82,7 +82,7 @@
         mFloatingActionButtonContainer.setVisibility(visible ? View.VISIBLE : View.GONE);
     }
 
-    private boolean isVisible() {
+    public boolean isVisible() {
         return mFloatingActionButtonContainer.getVisibility() == View.VISIBLE;
     }
 
@@ -167,12 +167,6 @@
      * @param delayMs The delay for the effect, in milliseconds.
      */
     public void scaleIn(int delayMs) {
-        if (isVisible()) {
-            mFloatingActionButtonContainer.setScaleX(1);
-            mFloatingActionButtonContainer.setScaleY(1);
-            return;
-        }
-
         setVisible(true);
         AnimUtils.scaleIn(mFloatingActionButtonContainer, FAB_SCALE_IN_DURATION, delayMs);
         AnimUtils.fadeIn(mFloatingActionButton, FAB_SCALE_IN_DURATION,