commit 9cfa24cbd952a027d8e0dea2b0f164820dd6ab8d
author Brian Attwell <brianattwell@google.com> Mon May 04 12:31:37 2015 -0700
committer Brian Attwell <brianattwell@google.com> Wed May 06 23:08:19 2015 +0000
tree 4f54925207156bf672005aea516663cae08043fd
parent 7b05ef81dba132cb36c6b2e041b246ad9a6ac253

Make FAB visible in onNewIntent

Bug: 20706976
Change-Id: I29e13345a6892630f148ac7c80989f5ef3ecb635
(cherry picked from commit 4d3e9d0ebf16d521b4376f46c3b366a68c9df4c4)

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 6a5d348..d4acc57 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -257,6 +257,7 @@
 
         // Re-configure fragments.
         configureFragments(true /* from request */);
+        initializeFabVisibility();
         invalidateOptionsMenuIfNeeded();
     }
 
@@ -375,9 +376,9 @@
         final ImageButton floatingActionButton
                 = (ImageButton) findViewById(R.id.floating_action_button);
         floatingActionButton.setOnClickListener(this);
-        initializeFabVisibility();
         mFloatingActionButtonController = new FloatingActionButtonController(this,
                 mFloatingActionButtonContainer, floatingActionButton);
+        initializeFabVisibility();
 
         invalidateOptionsMenuIfNeeded();
     }
@@ -504,6 +505,7 @@
         final boolean hideFab = mActionBarAdapter.isSearchMode()
                 || mActionBarAdapter.isSelectionMode();
         mFloatingActionButtonContainer.setVisibility(hideFab ? View.GONE : View.VISIBLE);
+        mFloatingActionButtonController.resetIn();
         wasLastFabAnimationScaleIn = !hideFab;
     }