Migrate to IntelliJ format, also contains some minor logging changes and moved librariesHEADmaster

1 files changed, 82 insertions, 0 deletions

diff --git a/app/build/intermediates/res/merged/debug/layout/share.xml b/app/build/intermediates/res/merged/debug/layout/share.xml
new file mode 100644
index 0000000..2573155
--- /dev/null
+++ b/app/build/intermediates/res/merged/debug/layout/share.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:android1="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+<ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+   <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="top"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Enter Filename" />
+
+        <EditText
+            android:id="@+id/filename"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true" />
+        <Button
+            android:id="@+id/uploadfile"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="Upload" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:gravity="top"
+	        android:orientation="horizontal"
+            android:background="#333333"
+            >
+
+	        <ImageView
+	            android:id="@+id/thumbnail"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_centerHorizontal="true"
+	            android:layout_margin="5dp"
+	            android1:layout_marginBottom="5dp" />
+
+		</RelativeLayout>
+       	    <LinearLayout
+	        android:id="@+id/content"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:orientation="horizontal" >
+       		<Button
+				android:id="@+id/rotateleft"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:text="Rotate Left"
+			/>
+	 		<Button
+				android:id="@+id/rotateright"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:text="Rotate Right"
+			/>
+
+	 		<CheckBox
+	 		    android1:id="@+id/resize"
+	 		    android1:layout_width="wrap_content"
+	 		    android1:layout_height="wrap_content"
+	 		    android1:checked="true"
+	 		    android1:text="Reduce Size" />
+
+	 		</LinearLayout>
+
+
+	    </LinearLayout>
+</ScrollView>
+</RelativeLayout>
+
+
+