Merge "IMS: Grey out merge menu item in more options" (4ec2ac72) · Commits · e / os / android_packages_apps_Dialer

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,7 @@ public class CallButtonFragment
		} else if (id == R.id.overflowButton) {
		if (mOverflowPopup != null) {
		updateRecordMenu();
		updateMergeCallsMenuItem();
		mOverflowPopup.show();
		}
		} else if (id == R.id.manageVideoCallConferenceButton) {
		@@ -317,6 +318,13 @@ public class CallButtonFragment
		}
		}

		private void updateMergeCallsMenuItem() {
		MenuItem item = mOverflowPopup.getMenu().findItem(BUTTON_MERGE);
		if (item != null) {
		item.setEnabled(mMergeButton.isEnabled());
		}
		}

		public void updateColors() {
		MaterialPalette themeColors = InCallPresenter.getInstance().getThemeColors();

+4 −0

Original line number	Diff line number	Diff line
		@@ -268,6 +268,10 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
		}

		public void mergeClicked() {
		if (mCall == null) {
		return;
		}

		if (getUi().getContext().getResources().getBoolean(
		R.bool.add_multi_participants_enabled)){
		int participantsCount = 0;