diff options
| author | Qi Wang <wangqi@google.com> | 2016-02-24 18:40:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-24 18:40:32 +0000 |
| commit | 1368a4b0d10269e4e25a2cd7f17ebb5af0a91d79 (patch) | |
| tree | 6ebae26465e8dcedac3cacd83d1f9784eee5d489 /InCallUI | |
| parent | 43f39e4b754e9769f9c9cf12ef4a98a9e3962350 (diff) | |
| parent | f0bf4ca8ca4b7d06db99f416480b81b0148ba6dc (diff) | |
Merge "Fix FAB position after hang up with secondary call." into nyc-dev
am: f0bf4ca8ca
* commit 'f0bf4ca8ca4b7d06db99f416480b81b0148ba6dc':
Fix FAB position after hang up with secondary call.
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 4 |
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); |