Merge branch 'master' of git.linphone.org:linphone-android

Makefile

@@ -29,7 +29,7 @@ SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION)
 SQLITE_URL=http://www.sqlite.org/2013/$(SQLITE_BASENAME).zip
 ENABLE_GPL_THIRD_PARTIES=1
 CC=
-
+PACKAGE_NAME=$(shell sed -nE 's|<property name="linphone.package.name" value="(.*)" />|\1|p' custom_rules.xml)
 #default options, can be overidden using make OPTION=value .
 
 ifeq ($(ENABLE_GPL_THIRD_PARTIES),1)
@@ -466,6 +466,9 @@ generate-mediastreamer2-apk: clean generate-mediastreamer2-libs
 	echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties && \
 	ant debug
 
+uninstall:
+	adb uninstall $(PACKAGE_NAME)
+
 install-apk:
 	ant installd
 

liblinphone_tester/Makefile

@@ -0,0 +1,6 @@
+all: 
+	ant debug
+	ant installd
+
+run-all-tests: all
+	ant test

res/layout-small/about.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent" 
-	android:layout_height="match_parent">
-    
-	<LinearLayout
-		android:layout_width="match_parent" 
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-	  	android:background="@drawable/background"
-		android:gravity="center">
-	    
-	    <ImageView
-	        android:contentDescription="@string/content_description_welcome"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:src="@drawable/logo_linphone_57x57" />
-	
-	    <TextView
-	        android:id="@+id/textView1"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:paddingTop="5dp"
-	        android:text="@string/app_name"
-	        android:textAppearance="?android:attr/textAppearanceLarge"
-	        android:textColor="@color/text_default"
-	        android:textSize="30dp"
-	        android:textStyle="bold" />
-	    
-		<TextView 
-		    android:layout_width="wrap_content"
-			android:layout_height="wrap_content" 
-			android:text="@string/about_text"
-			android:autoLink="web" 
-			android:gravity="center" 
-			android:paddingTop="50sp"
-			android:textStyle="bold" 
-			android:textColor="@color/text_contrast"
-			android:id="@+id/AboutText"/>
-
-        <Button
-            android:id="@+id/send_log"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="30sp"
-            android:text="@string/menu_send_log"
-            android:visibility="gone" />
-
-        <Button android:id="@+id/exit"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/menu_exit"
-			android:visibility="visible"
-			android:layout_marginTop="30sp"/>
-		
-	</LinearLayout>
-	
-</ScrollView>

res/layout/about.xml

@@ -6,29 +6,33 @@
     android:background="@drawable/background"
     android:gravity="center">
 
+    <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
+
     <ImageView
         android:contentDescription="@string/content_description_welcome"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/logo_linphone_57x57" />
 
+    <View android:layout_weight="5" android:layout_width="0dp" android:layout_height="0dp" />
+
     <TextView
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="5dp"
         android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@color/text_default"
         android:textSize="30dp"
         android:textStyle="bold" />
 
+
+    <View android:layout_weight="50" android:layout_width="0dp" android:layout_height="0dp" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/about_text"
         android:gravity="center"
-		android:paddingTop="50sp"
         android:textStyle="bold"
         android:textColor="@color/text_contrast"
         android:id="@+id/AboutText"/>
@@ -43,19 +47,33 @@
         android:textColor="@color/text_contrast"
         android:id="@+id/AboutLink"/>
 
+    <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:gravity="center_horizontal"
+        android:layout_height="wrap_content">
+
+        <LinearLayout android:id="@+id/send_log_layout"
+            android:visibility="visible"
+            android:gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
             <Button
                 android:id="@+id/send_log"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-	    android:layout_marginTop="30sp"
+                android:text="@string/menu_send_log"/>
-	    android:text="@string/menu_send_log"
+            <View android:layout_width="50dp" android:layout_height="0dp" />
-	    android:visibility="gone" />
+        </LinearLayout>
-	
        <Button  android:id="@+id/exit"
+                android:gravity="center"
+                android:layout_toRightOf="@id/send_log_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/menu_exit"
-		android:visibility="visible"
+       />
-		android:layout_marginTop="30sp"/>
+    </LinearLayout>
+    <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
 
 </LinearLayout>

res/raw-sw600dp/linphonerc_factory

@@ -10,8 +10,6 @@ auto_answer_replacing_calls=1
 media_encryption_mandatory=0
 ping_with_options=0
 root_ca=/data/data/org.linphone/files/rootca.pem
-sip_port=-1
-sip_tcp_port=-1
 
 [rtp]
 audio_rtp_port=7076

res/raw/linphonerc_factory

@@ -10,8 +10,6 @@ auto_answer_replacing_calls=1
 media_encryption_mandatory=0
 ping_with_options=0
 root_ca=/data/data/org.linphone/files/rootca.pem
-sip_port=-1
-sip_tcp_port=-1
 
 [rtp]
 audio_rtp_port=7076

res/values-FR/strings.xml

@@ -404,6 +404,5 @@
 	<string name="retry">Renvoyer</string>
 
 	<string name="remote_provisioning_failure">Erreur durant le téléchargement ou l\'application de la configuration distante...</string>
-	<string name="remote_provisioning_again_title">Remote provisioning</string>
+	<string name="pref_voice_mail">Adresse messagerie vocale</string>
-	<string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string>
 </resources>

src/org/linphone/AboutFragment.java

@@ -27,6 +27,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 /**
@@ -36,6 +37,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
 	private FragmentsAvailable about = FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT;
 	View exitButton = null;
 	View sendLogButton = null;
+	LinearLayout sendLogLayout = null;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -55,7 +57,8 @@ public class AboutFragment extends Fragment implements OnClickListener {
 
 		sendLogButton = view.findViewById(R.id.send_log);
 		sendLogButton.setOnClickListener(this);
-		sendLogButton.setVisibility(getResources().getBoolean(R.bool.enable_log_collect) ? View.VISIBLE : View.GONE);
+        sendLogLayout = (LinearLayout)view.findViewById(R.id.send_log_layout);
+        sendLogLayout.setVisibility(getResources().getBoolean(R.bool.enable_log_collect) ? View.VISIBLE : View.GONE);
 
 		exitButton = view.findViewById(R.id.exit);
 		exitButton.setOnClickListener(this);