diff options
| author | Andrew Lee <anwlee@google.com> | 2014-08-22 23:40:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 23:40:13 +0000 |
| commit | 5ef89ed01f89a78c28b09b4d4a218c6a47a9d03e (patch) | |
| tree | 6382f0f70c940ab3ad8d1f6bd8ebb1a0ef9d216d /InCallUI/src/com/android/incallui/CallButtonFragment.java | |
| parent | 0ada5e932a809d0e90ec4bf16db28738971cbdc8 (diff) | |
| parent | 79858d44ebdf946712a801988a827d46d7f7cbe8 (diff) | |
Merge "Remove generic call merge button." into lmp-dev
Diffstat (limited to 'InCallUI/src/com/android/incallui/CallButtonFragment.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonFragment.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index 74aeaf393..5744cc5a1 100644 --- a/InCallUI/src/com/android/incallui/CallButtonFragment.java +++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java @@ -60,7 +60,6 @@ public class CallButtonFragment private PopupMenu mOverflowPopup; private View mExtraRowButton; private View mManageConferenceButton; - private View mGenericMergeButton; private int mPrevAudioMode = 0; @@ -95,8 +94,6 @@ public class CallButtonFragment mManageConferenceButton = parent.findViewById(R.id.manageConferenceButton); mManageConferenceButton.setOnClickListener(this); - mGenericMergeButton = parent.findViewById(R.id.cdmaMergeButton); - mGenericMergeButton.setOnClickListener(this); mAudioButton = (ImageButton) parent.findViewById(R.id.audioButton); mAudioButton.setOnClickListener(this); @@ -166,7 +163,6 @@ public class CallButtonFragment getPresenter().muteClicked(!button.isSelected()); break; } - case R.id.cdmaMergeButton: case R.id.mergeButton: getPresenter().mergeClicked(); break; @@ -679,14 +675,6 @@ public class CallButtonFragment public void showManageConferenceCallButton() { mExtraRowButton.setVisibility(View.VISIBLE); mManageConferenceButton.setVisibility(View.VISIBLE); - mGenericMergeButton.setVisibility(View.GONE); - } - - @Override - public void showGenericMergeButton() { - mExtraRowButton.setVisibility(View.VISIBLE); - mManageConferenceButton.setVisibility(View.GONE); - mGenericMergeButton.setVisibility(View.VISIBLE); } @Override |