commit 74ffe87630323e9f50a7e41475638045eb7a00d0
author Devci Telephony <devci-telephony@localhost> Sun Dec 18 01:23:43 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Dec 18 01:23:43 2016 -0800
tree 6daf988e63fa223140a3031000a645d7bf628edb
parent b2737974f5d5f45624970df02feeabc9762f6aab
parent 4dd3306d9d24d103ed07e1abbf48fb6cdc67afa1

Merge "IMS: Grey out merge menu item in more options" into atel.lnx.2.0-dev

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 cdc0359..fa76bba 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java
@@ -290,6 +290,7 @@
         } else if (id == R.id.overflowButton) {
             if (mOverflowPopup != null) {
                 updateRecordMenu();
+                updateMergeCallsMenuItem();
                 mOverflowPopup.show();
             }
         } else if (id == R.id.manageVideoCallConferenceButton) {
@@ -356,6 +357,13 @@
         }
     }
 
+    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();
 

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

diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index ec330a2..0a8e0bd 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -268,6 +268,10 @@
     }
 
     public void mergeClicked() {
+        if (mCall == null) {
+            return;
+        }
+
         if (getUi().getContext().getResources().getBoolean(
                 R.bool.add_multi_participants_enabled)){
             int participantsCount = 0;