Commit 9988b3e4 authored by Eryk Leniart's avatar Eryk Leniart

Layout

parent 874917f4
This diff is collapsed.
...@@ -35,13 +35,12 @@ ...@@ -35,13 +35,12 @@
android:name=".StreamCameraActivity" android:name=".StreamCameraActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:theme="@android:style/Theme.NoTitleBar"> android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
</activity> </activity>
<activity android:name=".PeepersPreferenceActivity" /> <activity android:name=".PeepersPreferenceActivity" />
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/title_activity_main" android:label="@string/title_activity_main">
android:theme="@android:style/Theme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
......
...@@ -301,6 +301,9 @@ public final class StreamCameraActivity extends Activity ...@@ -301,6 +301,9 @@ public final class StreamCameraActivity extends Activity
"\n" + "\n" +
"</head>\n" + "</head>\n" +
"<body>\n" + "<body>\n" +
"<style>\n" +
"* { margin: 0; padding: 0 }" +
"</style>\n" +
"\t<div style='width:50%;display:inline-block;height:auto'>\n" + "\t<div style='width:50%;display:inline-block;height:auto'>\n" +
"\t\t<img style='width:100%' src='" + "http://" + clientAddressIp +"'/>\n" + "\t\t<img style='width:100%' src='" + "http://" + clientAddressIp +"'/>\n" +
"\t</div>\n" + "\t</div>\n" +
......
...@@ -17,17 +17,23 @@ ...@@ -17,17 +17,23 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="#000000">
<SurfaceView <SurfaceView
android:id="@+id/camera" android:id="@+id/camera"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:background="#000000"/>
<WebView <WebView
android:id="@+id/webview" android:id="@+id/webview"
android:layout_width="fill_parent" android:layout_centerInParent="true"
android:layout_height="fill_parent" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#000000"
android:layout_centerVertical="true"
/>
<Button <Button
android:layout_width="100dp" android:layout_width="100dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment