From a2e3dedbe4e09c4299143110bf938956c74ffe6c Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Mon, 9 Sep 2013 12:38:17 +0100
Subject: integrated working example

---
 res/layout/activity_main.xml | 16 ----------------
 res/layout/main.xml          | 40 ++++++++++++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 22 deletions(-)
 delete mode 100644 res/layout/activity_main.xml

(limited to 'res')

diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
deleted file mode 100644
index 168c9b8..0000000
--- a/res/layout/activity_main.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<RelativeLayout 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: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" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_world" />
-
-</RelativeLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 40bfa59..be086c3 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,9 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SurfaceView android:id="@+id/surface_camera"     
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_centerInParent="true"
-    android:layout_weight="1"
-    >
-</SurfaceView>
\ No newline at end of file
+    android:orientation="vertical" >
+
+    <FrameLayout
+        android:id="@+id/preview"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="1" >
+
+        <SurfaceView
+            android:id="@+id/surfaceView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent" >"
+			<LinearLayout
+			    android:layout_width="fill_parent"
+			    android:layout_height="2px"
+			    android:layout_gravity="center_vertical"
+			    android:background="#ff0000" 
+			    android:layout_weight=".80" />
+            <Button
+                android:id="@+id/buttonClick"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="Click" />
+        </LinearLayout>
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3