From a13cb5796bd2190161240bbf858563c81f383374 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Fri, 7 Nov 2014 14:43:00 -0800
Subject: Grey out merge button after it is clicked.

Bug: 18230928
Change-Id: I5be1ab8cb759aa7afe1e937f7b3223ed3d6dcac2
---
 InCallUI/src/com/android/incallui/CallButtonFragment.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java
index 261378235..cf1c11932 100644
--- a/InCallUI/src/com/android/incallui/CallButtonFragment.java
+++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java
@@ -167,6 +167,7 @@ public class CallButtonFragment
             }
             case R.id.mergeButton:
                 getPresenter().mergeClicked();
+                mMergeButton.setEnabled(false);
                 break;
             case R.id.holdButton: {
                 final ImageButton button = (ImageButton) view;
@@ -406,6 +407,11 @@ public class CallButtonFragment
     @Override
     public void showMergeButton(boolean show) {
         mMergeButton.setVisibility(show ? View.VISIBLE : View.GONE);
+
+        // If the merge button was disabled, re-enable it when hiding it.
+        if (!show) {
+            mMergeButton.setEnabled(true);
+        }
     }
 
     @Override
-- 
cgit v1.2.3