Merge "Fix FAB position after hang up with secondary call." into nyc-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 84a732ccc..9ba4a2b70 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -649,6 +649,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         // height will be determined on layout.
         if (isVisible) {
             mSecondaryCallInfo.setVisibility(View.VISIBLE);
+        } else {
+            mSecondaryCallInfo.setVisibility(View.GONE);
         }
 
         updateFabPositionForSecondaryCallInfo();
@@ -667,6 +669,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
                 int secondaryHeight = mSecondaryCallInfo.getHeight();
                 if (isVisible) {
                     mSecondaryCallInfo.setVisibility(View.GONE);
+                } else {
+                    mSecondaryCallInfo.setVisibility(View.VISIBLE);
                 }
                 Log.v(this, "setSecondaryInfoVisible: secondaryHeight = " + secondaryHeight);