From eca5759d981d92b3dd345dfc145796384d4b7c02 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 28 三月 2017 11:28:51 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/activity_test_argb_8888_actiivty.xml |   98 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/activity_test_argb_8888_actiivty.xml b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/activity_test_argb_8888_actiivty.xml
index 791c011..08ee0d8 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/activity_test_argb_8888_actiivty.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/res/merged/debug/layout/activity_test_argb_8888_actiivty.xml
@@ -1,24 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_test_argb_8888_actiivty"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.bsk.zhangbo.demoforbsk.ui.activity.TestARGB8888Actiivty">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    <!--<LinearLayout-->
+        <!--android:orientation="horizontal"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_margin="8dip"-->
+        <!--&gt;-->
+        <!--<TextView-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="Please select the media source"-->
+            <!--/>-->
+        <!--<Spinner-->
+            <!--android:id="@+id/source_spinner"-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="Media source"-->
+            <!--/>-->
+    <!--</LinearLayout>-->
 
-    <SurfaceView
-        android:id="@+id/surfaceview1"
-        android:layout_width="640px"
-        android:layout_height="480px"/>
-    <!--<ImageView-->
-        <!--android:id="@+id/test_img"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:scaleType="fitXY"/>-->
-    <Button
-        android:id="@+id/btn"
-        android:text="play"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-</RelativeLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dip"
+        >
+        <Button
+            android:id="@+id/start_native"
+            android:text="Start/Pause"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            />
+        <Button
+            android:id="@+id/rewind_native"
+            android:text="Rewind"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dip"
+        >
+        <SurfaceView
+            android:id="@+id/surfaceview1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </LinearLayout>
+
+    <!--<LinearLayout-->
+        <!--android:orientation="horizontal"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_margin="8dip"-->
+        <!--&gt;-->
+        <!--<RadioButton-->
+            <!--android:id="@+id/radio2"-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:padding="10dip"-->
+            <!--/>-->
+        <!--<com.bsk.zhangbo.demoforbsk.widget.MyGLSurfaceView-->
+            <!--android:id="@+id/glsurfaceview1"-->
+            <!--android:layout_width="640px"-->
+            <!--android:layout_height="480px"-->
+            <!--/>-->
+    <!--</LinearLayout>-->
+
+</LinearLayout>

--
Gitblit v1.8.0