From 30d164851ac3d4e7397e010baa24a8e5cb0dc090 Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@lc8n.com>
Date: Tue, 15 Dec 2015 20:43:45 +0000
Subject: Migrate to IntelliJ format, also contains some minor logging changes
 and moved libraries

---
 .../res/merged/debug/layout/uploadlocation.xml     | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 app/build/intermediates/res/merged/debug/layout/uploadlocation.xml

(limited to 'app/build/intermediates/res/merged/debug/layout/uploadlocation.xml')

diff --git a/app/build/intermediates/res/merged/debug/layout/uploadlocation.xml b/app/build/intermediates/res/merged/debug/layout/uploadlocation.xml
new file mode 100644
index 0000000..69251e4
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/uploadlocation.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content">
+   <TextView
+ 	android:text="Current Location"
+ 	     android:layout_height="wrap_content"
+     android:layout_width="wrap_content"
+ 	 />
+ <TextView
+ 	android:id="@+id/location"
+ 	android:text=""
+ 	     android:layout_height="wrap_content"
+     android:layout_width="wrap_content"
+ 	 />
+ 	 <LinearLayout
+ 	   android:orientation="horizontal"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  >
+ <Button
+     android:id="@+id/getlocation"
+     android:layout_height="wrap_content"
+     android:layout_width="wrap_content"
+     android:text="Get Location"
+/>
+ <Button
+     android:id="@+id/uploadlocation"
+     android:layout_height="wrap_content"
+     android:layout_width="wrap_content"
+     android:text="Upload"
+/>
+</LinearLayout>
+</LinearLayout>
-- 
cgit v1.2.3