From dd4aa48e1e90e6599b04ed26ec8c567943951a3e Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 2 Sep 2015 09:27:09 +0200
Subject: [PATCH] Fix cancel add/transfer call

---
 src/org/linphone/DialerFragment.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java
index cdcc56568..57d4999fc 100644
--- a/src/org/linphone/DialerFragment.java
+++ b/src/org/linphone/DialerFragment.java
@@ -77,6 +77,7 @@ public class DialerFragment extends Fragment {
 		}
 		
 		mAddContact = (ImageView) view.findViewById(R.id.addContact);
+		mAddContact.setEnabled(!(LinphoneActivity.isInstanciated() && LinphoneManager.getLc().getCallsNb() > 0));
 		
 		addContactListener = new OnClickListener() {
 			@Override
@@ -102,8 +103,7 @@ public class DialerFragment extends Fragment {
 				LinphoneActivity.instance().resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
 			}
 		};
-		
-		mAddContact.setEnabled(!(LinphoneActivity.isInstanciated() && LinphoneManager.getLc().getCallsNb() > 0));
+
 		resetLayout(isCallTransferOngoing);
 		
 		if (getArguments() != null) {
@@ -164,12 +164,12 @@ public class DialerFragment extends Fragment {
 				mCall.resetClickListener();
 			}
 			mAddContact.setEnabled(true);
-			//mAddContact.setImageResource(R.drawable.cancel);
+			mAddContact.setImageResource(R.drawable.call_back);
 			mAddContact.setOnClickListener(cancelListener);
 		} else {
 			mCall.setImageResource(R.drawable.call_audio_start);
-			mAddContact.setEnabled(true);
-			//mAddContact.setImageResource(R.drawable.add_contact_button);
+			mAddContact.setEnabled(false);
+			mAddContact.setImageResource(R.drawable.contact_add_button);
 			mAddContact.setOnClickListener(addContactListener);
 			enableDisableAddContact();
 		}