Hide transfer button if not allowed + fixes

res/layout-land/incall.xml

@@ -44,7 +44,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="70dp"
             android:layout_weight="1"
             android:orientation="horizontal" >
 
@@ -96,7 +96,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="70dp"
             android:layout_weight="1"
             android:orientation="horizontal" >
 

res/layout/incoming.xml

@@ -21,12 +21,13 @@
 		    android:textColor="@android:color/white"
 		    android:textSize="22dp" />
 	
-		<LinearLayout 
+		<LinearLayout
 		    android:layout_width="match_parent"
-			android:layout_height="match_parent" 
+		    android:layout_height="match_parent"
 		    android:layout_weight="0.1"
-			android:orientation="vertical"
-			android:paddingTop="30dip">
+		    android:gravity="center_horizontal"
+		    android:orientation="vertical"
+		    android:paddingTop="30dip" >
 			
 		    <org.linphone.ui.AvatarWithShadow
 			    android:id="@+id/incoming_picture"

src/org/linphone/InCallActivity.java

@@ -61,7 +61,7 @@ public class InCallActivity extends FragmentActivity implements
 	private StatusFragment status;
 	private AudioCallFragment audioCallFragment;
 	private VideoCallFragment videoCallFragment;
-	private boolean isSpeakerEnabled = false, isMicMuted = false, isVideoEnabled;
+	private boolean isSpeakerEnabled = false, isMicMuted = false, isVideoEnabled, isTransferAllowed;
 	private LinearLayout mControlsLayout;
 	
 	@Override
@@ -70,6 +70,7 @@ public class InCallActivity extends FragmentActivity implements
         setContentView(R.layout.incall);
         
         isVideoEnabled = getIntent().getExtras() != null && getIntent().getExtras().getBoolean("VideoEnabled");
+        isTransferAllowed = getResources().getBoolean(R.bool.allow_transfers);
         
         if (findViewById(R.id.fragmentContainer) != null) {
             initUI();
@@ -135,6 +136,10 @@ public class InCallActivity extends FragmentActivity implements
         switchCamera.setOnClickListener(this);
 		
 		mControlsLayout = (LinearLayout) findViewById(R.id.menu);
+		
+        if (!isTransferAllowed) {
+        	addCall.setImageResource(R.drawable.options_add_call);
+        }
 	}
 	
 	private void enableAndRefreshInCallActions() {
@@ -426,7 +431,9 @@ public class InCallActivity extends FragmentActivity implements
 		if (addCall.getVisibility() == View.VISIBLE) {
 			options.setImageResource(R.drawable.options);
 			if (getResources().getBoolean(R.bool.disable_animations)) {
-				transfer.setVisibility(View.GONE);
+				if (isTransferAllowed) {
+					transfer.setVisibility(View.GONE);
+				}
 				addCall.setVisibility(View.GONE);
 			} else {
 				Animation anim = AnimationUtils.loadAnimation(this, R.anim.slide_out_left_to_right);
@@ -443,16 +450,22 @@ public class InCallActivity extends FragmentActivity implements
 					
 					@Override
 					public void onAnimationEnd(Animation animation) {
-						transfer.setVisibility(View.GONE);
+						if (isTransferAllowed) {
+							transfer.setVisibility(View.GONE);
+						}
 						addCall.setVisibility(View.GONE);
 					}
 				});
-				transfer.startAnimation(anim);
+				if (isTransferAllowed) {
+					transfer.startAnimation(anim);
+				}
 				addCall.startAnimation(anim);
 			}
 		} else {		
 			if (getResources().getBoolean(R.bool.disable_animations)) {
-				transfer.setVisibility(View.VISIBLE);
+				if (isTransferAllowed) {
+					transfer.setVisibility(View.VISIBLE);
+				}
 				addCall.setVisibility(View.VISIBLE);
 				options.setImageResource(R.drawable.options_alt);
 			} else {
@@ -471,11 +484,15 @@ public class InCallActivity extends FragmentActivity implements
 					@Override
 					public void onAnimationEnd(Animation animation) {
 						options.setImageResource(R.drawable.options_alt);
-						transfer.setVisibility(View.VISIBLE);
+						if (isTransferAllowed) {
+							transfer.setVisibility(View.VISIBLE);
+						}
 						addCall.setVisibility(View.VISIBLE);
 					}
 				});
-				transfer.startAnimation(anim);
+				if (isTransferAllowed) {
+					transfer.startAnimation(anim);
+				}
 				addCall.startAnimation(anim);
 			}
 		}

src/org/linphone/LinphoneActivity.java

@@ -616,7 +616,9 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 			@Override
 			public void run() {
 				isInCallLayout = false;
-				((DialerFragment) dialerFragment).resetLayout();
+				if (dialerFragment != null) {
+					((DialerFragment) dialerFragment).resetLayout();
+				}
 				
 				if (LinphoneManager.getLc().getCallsNb() > 0) {
 					LinphoneCall call = LinphoneManager.getLc().getCalls()[0];