commit f0bf4ca8ca4b7d06db99f416480b81b0148ba6dc
author Qi Wang <wangqi@google.com> Wed Feb 24 18:31:44 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 24 18:31:44 2016 +0000
tree b3d12f3f68b91bea18885a742d19db71157f4016
parent bfae5c2a96daeda5e4a772cfb5228c5eae018af7
parent 447fb6ec30d8823ce5fbd1080a1fe6e78a91f183

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

InCallUI/src/com/android/incallui/CallCardFragment.java

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