diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-14 13:05:25 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-14 13:05:25 -0700 |
| commit | 45013164c6bc65fc2b3ed29c214a886e0a6934a4 (patch) | |
| tree | 284689dd9441c84ebf4e6d633a04a045413fca02 /InCallUI | |
| parent | 024117849a290ac7cbe2fdab27d0c9a75c4e2644 (diff) | |
| parent | 1430d895acbcdc152e17709dec1f356c41b875b3 (diff) | |
resolved conflicts for merge of 08235996 to master
Change-Id: I846f0b0801fa66a1b9117daf9014729695f54e4b
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 1de6fda51..bf3429f46 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -133,7 +133,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr @Override public void setShowConnectionHandoff(boolean showConnectionHandoff) { Log.v(this, "setShowConnectionHandoff: " + showConnectionHandoff); - mConnectionHandoffButton.setVisibility(showConnectionHandoff ? View.VISIBLE : View.GONE); } @Override |