Closed #1723: Merging pjsua2 branch into trunk

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4704 74dad513-b988-da41-8d7b-12977e46ad98

4 files changed, 207 insertions, 0 deletions

diff --git a/pjsip-apps/src/swig/java/android/res/layout/activity_call.xml b/pjsip-apps/src/swig/java/android/res/layout/activity_call.xml
new file mode 100644
index 00000000..3745eb39
--- /dev/null
+++ b/pjsip-apps/src/swig/java/android/res/layout/activity_call.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    android:layout_width="match_parent"

+    android:layout_height="match_parent"

+    android:gravity="center"

+    android:paddingBottom="@dimen/activity_vertical_margin"

+    android:paddingLeft="@dimen/activity_horizontal_margin"

+    android:paddingRight="@dimen/activity_horizontal_margin"

+    android:paddingTop="@dimen/activity_vertical_margin"

+    android:orientation="vertical" >

+

+    <TextView

+        android:id="@+id/textViewPeer"

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:gravity="center_horizontal"

+        android:text="Peer URI"

+        android:textAppearance="?android:attr/textAppearanceLarge" />

+

+    <TextView

+        android:id="@+id/textViewCallState"

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:gravity="center"

+        android:text="Call state" />

+

+    <Button

+        android:id="@+id/buttonAccept"

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:onClick="acceptCall"

+        android:text="Accept" />

+

+    <Button

+        android:id="@+id/buttonHangup"

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:onClick="hangupCall"

+        android:text="Reject" />

+

+</LinearLayout>
\ No newline at end of file
diff --git a/pjsip-apps/src/swig/java/android/res/layout/activity_main.xml b/pjsip-apps/src/swig/java/android/res/layout/activity_main.xml
new file mode 100644
index 00000000..c63c0210
--- /dev/null
+++ b/pjsip-apps/src/swig/java/android/res/layout/activity_main.xml
@@ -0,0 +1,65 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+    xmlns:tools="http://schemas.android.com/tools"

+    android:layout_width="match_parent"

+    android:layout_height="match_parent"

+    android:orientation="vertical"

+    android:paddingBottom="@dimen/activity_vertical_margin"

+    android:paddingLeft="@dimen/activity_horizontal_margin"

+    android:paddingRight="@dimen/activity_horizontal_margin"

+    android:paddingTop="@dimen/activity_vertical_margin"

+    tools:context=".MainActivity" >

+

+    <ListView

+        android:id="@+id/listViewBuddy"

+        android:layout_width="match_parent"

+        android:layout_height="match_parent"

+        android:layout_weight="1"

+    	android:listSelector="@drawable/bkg" >

+    </ListView>

+

+    <LinearLayout

+        android:layout_width="match_parent"

+        android:layout_height="wrap_content"

+        android:orientation="horizontal" >

+

+        <ImageButton

+            android:id="@+id/buttonCall"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_weight="1"

+            android:onClick="makeCall"

+            android:src="@android:drawable/ic_menu_call" />

+

+        <TextView

+            android:layout_width="wrap_content"

+            android:layout_height="match_parent"

+            android:layout_weight="1"

+			android:text="   "/>

+

+        <ImageButton

+            android:id="@+id/buttonAddBuddy"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_weight="1"

+            android:onClick="addBuddy"

+            android:src="@android:drawable/ic_menu_add" />

+        

+        <ImageButton

+            android:id="@+id/buttonEditBuddy"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_weight="1"

+            android:onClick="editBuddy"

+            android:src="@android:drawable/ic_menu_edit" />

+        

+        <ImageButton

+            android:id="@+id/buttonDelBuddy"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_weight="1"

+            android:onClick="delBuddy"

+            android:src="@android:drawable/ic_menu_delete" />

+

+        </LinearLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml b/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml
new file mode 100644
index 00000000..71111f14
--- /dev/null
+++ b/pjsip-apps/src/swig/java/android/res/layout/dlg_account_config.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>

+<TableLayout

+    xmlns:android="http://schemas.android.com/apk/res/android"

+    android:padding = "20dp"

+    android:layout_width="match_parent"

+    android:layout_height="match_parent">

+

+    <TextView

+        android:id="@+id/textViewInfo"

+        android:textAppearance="?android:attr/textAppearanceSmall"

+    	android:paddingBottom="20dp"

+        android:textColor="#b0b0b0" >

+    </TextView>

+    

+	<TableRow>

+        <TextView android:text="ID">

+        </TextView>  

+

+	    <EditText

+	        android:id="@+id/editTextId"

+	        android:layout_width="match_parent"

+	        android:layout_height="wrap_content"

+	        android:layout_weight="1"

+	        android:inputType="textUri" >

+

+	        <requestFocus />

+	    </EditText>

+    </TableRow>

+	<TableRow>

+        <TextView android:text="Registrar">

+        </TextView>  

+	    <EditText

+	        android:id="@+id/editTextRegistrar"

+	        android:layout_width="match_parent"

+	        android:layout_height="wrap_content"

+	        android:layout_weight="1"

+	        android:inputType="textUri" >

+	    </EditText>

+    </TableRow>

+	<TableRow>

+        <TextView android:text="Proxy">

+        </TextView>  

+	    <EditText

+	        android:id="@+id/editTextProxy"

+	        android:layout_width="match_parent"

+	        android:layout_height="wrap_content"

+	        android:layout_weight="1"

+	        android:inputType="textUri" >

+	    </EditText>

+    </TableRow>

+	<TableRow>

+        <TextView android:text="Username">

+        </TextView>  

+

+	    <EditText

+	        android:id="@+id/editTextUsername"

+	        android:layout_width="match_parent"

+	        android:layout_height="wrap_content"

+	        android:layout_weight="1"

+	        android:inputType="text" >

+

+	    </EditText>

+    </TableRow>

+	<TableRow>

+        <TextView android:text="Password">

+        </TextView>  

+

+	    <EditText

+	        android:id="@+id/editTextPassword"

+	        android:layout_width="match_parent"

+	        android:layout_height="wrap_content"

+	        android:layout_weight="1"

+	        android:inputType="textPassword" >

+

+	    </EditText>

+    </TableRow>

+</TableLayout>

diff --git a/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml b/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml
new file mode 100644
index 00000000..f13e7005
--- /dev/null
+++ b/pjsip-apps/src/swig/java/android/res/layout/dlg_add_buddy.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<TableLayout

+    xmlns:android="http://schemas.android.com/apk/res/android"

+    android:padding = "20dp"

+    android:layout_width="match_parent"

+    android:layout_height="match_parent">

+	<TableRow>

+        <TextView android:text="Buddy URI">

+        </TextView>  

+

+	    <EditText

+	        android:id="@+id/editTextUri"

+	        android:layout_weight="1"

+	        android:inputType="textUri" >

+	        <requestFocus />

+	    </EditText>

+    </TableRow>

+	<TableRow>

+        <CheckBox

+            android:id="@+id/checkBoxSubscribe"

+            android:layout_column="1"

+            android:text="Subscribe presence" />

+    </TableRow>

+</TableLayout>