Re #1790:

 - Removed android_opengl_get_surface() for renderer view setup, Java application can directly supply Surface object as renderer window.
 - Added renderer view on pjsua CLI app sample.



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

1 files changed, 23 insertions, 11 deletions

diff --git a/pjsip-apps/src/pjsua/android/res/layout/activity_main.xml b/pjsip-apps/src/pjsua/android/res/layout/activity_main.xml
index da258b76..24a13372 100644
--- a/pjsip-apps/src/pjsua/android/res/layout/activity_main.xml
+++ b/pjsip-apps/src/pjsua/android/res/layout/activity_main.xml
@@ -4,31 +4,43 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <ImageView
-        android:id="@+id/imageApp"
+    <TextView
+        android:id="@+id/textStatus"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/textApp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="false"
         android:layout_centerHorizontal="true"
-        android:contentDescription="@string/app_name"
-        android:src="@drawable/main_image" />
+        android:textIsSelectable="false" />
+
+    <SurfaceView
+        android:id="@+id/surfaceViewIncomingCall"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/imageApp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginBottom="50dp" />
 
     <TextView
         android:id="@+id/textApp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_above="@+id/textStatus"
         android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
+        android:layout_marginBottom="126dp"
         android:text="@string/app_name"
         android:textSize="40sp"
         android:typeface="serif" />
 
-    <TextView
-        android:id="@+id/textStatus"
+    <ImageView
+        android:id="@+id/imageApp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true" 
-        android:textIsSelectable="false"/>
+        android:layout_above="@+id/textApp"
+        android:layout_centerHorizontal="true"
+        android:contentDescription="@string/app_name"
+        android:src="@drawable/main_image" />
 
 </RelativeLayout>
\ No newline at end of file