Merge remote-tracking branch 'public/master' into bellesip

Conflicts:
	submodules/linphone

res/layout-small/incall.xml

@@ -47,11 +47,10 @@
         android:id="@+id/numpad"
         android:background="@drawable/dialer_alt_background"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:visibility="invisible"
         android:layout_centerHorizontal="true"
-        android:layout_below="@id/switchCamera"
+        android:layout_centerVertical="true" />
-        android:layout_marginBottom="150dp" />
 
     <LinearLayout
         android:id="@+id/menu"

res/layout/history_cell_simple.xml

@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
     android:background="@drawable/list_selector"
+    android:gravity="center_vertical"
     android:orientation="vertical" >
     
     <TextView
@@ -48,27 +48,27 @@
 		    android:layout_marginLeft="10dp" />
 		
 		<ImageView
-	        android:contentDescription="@string/content_description_detail"
 		    android:id="@+id/detail"
 		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
+		    android:layout_height="match_parent"
-		    android:adjustViewBounds="true"
 		    android:layout_weight="0.9"
-		    android:src="@drawable/list_detail"
+		    android:adjustViewBounds="true"
-		    android:layout_marginLeft="5dp"
+		    android:contentDescription="@string/content_description_detail"
-		    android:layout_marginRight="5dp" />
+		    android:paddingLeft="5dp"
+		    android:paddingRight="5dp"
+		    android:src="@drawable/list_detail" />
 		
 		<ImageView
-	        android:contentDescription="@string/content_description_delete"
 		    android:id="@+id/delete"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
-		    android:adjustViewBounds="true"
 		    android:layout_weight="0.9"
-		    android:visibility="gone"
+		    android:adjustViewBounds="true"
+		    android:contentDescription="@string/content_description_delete"
+		    android:paddingLeft="5dp"
+		    android:paddingRight="5dp"
 		    android:src="@drawable/list_delete"
-		    android:layout_marginLeft="5dp"
+		    android:visibility="gone" />
-		    android:layout_marginRight="5dp" />
 		
 	</LinearLayout>
     

res/layout/incall.xml

@@ -47,11 +47,10 @@
         android:id="@+id/numpad"
         android:background="@drawable/dialer_alt_background"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:visibility="invisible"
         android:layout_centerHorizontal="true"
-        android:layout_below="@id/switchCamera"
+        android:layout_centerVertical="true"/>
-        android:layout_marginBottom="150dp" />
 
     <LinearLayout
         android:id="@+id/menu"

src/org/linphone/ChatFragment.java

@@ -324,7 +324,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 								@Override
 								public void run() {
 									//Scroll to latest saw message
-									messagesScrollView.scrollTo(0, messagesLayout.getChildAt(MESSAGES_STEP-1).getBottom());
+									if (messagesScrollView != null && messagesLayout != null && messagesLayout.getChildCount() >= MESSAGES_STEP-1)
+										messagesScrollView.scrollTo(0, messagesLayout.getChildAt(MESSAGES_STEP-1).getBottom());
 								}
 							}, 300);
 						}

src/org/linphone/LinphoneActivity.java

@@ -232,12 +232,12 @@ public class LinphoneActivity extends FragmentActivity implements
 			return;
 		}
 		
-		findViewById(R.id.status).setVisibility(View.VISIBLE);
 		if (statusFragment != null && !statusFragment.isVisible()) {
 			// Hack to ensure statusFragment is visible after coming back to
 			// dialer from chat
 			statusFragment.getView().setVisibility(View.VISIBLE);
 		}
+		findViewById(R.id.status).setVisibility(View.VISIBLE);
 		findViewById(R.id.fragmentContainer).setPadding(0, LinphoneUtils.pixelsToDpi(getResources(), 40), 0, 0);
 	}
 
@@ -1384,6 +1384,9 @@ public class LinphoneActivity extends FragmentActivity implements
 					showStatusBar();
 					reloadConfig();
 					updateAnimationsState();
+				} else if (currentFragment == FragmentsAvailable.CHATLIST) {
+					//Hack to ensure display the status bar on some devices
+					showStatusBar();
 				}
 			}
 		} else if (keyCode == KeyEvent.KEYCODE_MENU && statusFragment != null) {

submodules/msilbc

@@ -1 +1 @@
-Subproject commit 32a39741b64d74999134f5e6425609c4cfff5daf
+Subproject commit f9f77d4fe04cd51aa3ca4b3b35ac51667c48139e

submodules/mssilk

@@ -1 +1 @@
-Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40
+Subproject commit f21cf1f038496c14c66f2387df9542c5f5e28cf1