From 79858d44ebdf946712a801988a827d46d7f7cbe8 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 22 Aug 2014 14:53:20 -0700 Subject: Remove generic call merge button. We now use the same button component for merge. Formerly, it seems that it was included in the "extra button row" to accomodate the add and merge options both showing at the same time. Now, we handle this as an additional scenario for the overflow menu button. This is prework in order to be able to delete the extra button row, and add a different "row" for the conferece call manager. Bug: 15862303 Change-Id: I278ea17291d8daf3c5201116a10e3641b5deb4e1 --- InCallUI/src/com/android/incallui/CallButtonFragment.java | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'InCallUI/src/com/android/incallui/CallButtonFragment.java') diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index 09a3bc292..b58278bd9 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; @@ -674,14 +670,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 -- cgit v1.2.3