From 864ad84952ca9003887b8cf8dfab450edc2c848c Mon Sep 17 00:00:00 2001
From: Stephen Beitzel <sbeitzel@pobox.com>
Date: Thu, 1 Aug 2013 14:32:26 -0700
Subject: [PATCH 1/2] Update to ignore Android Studio metadata

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6bc71e0..e9fa834 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# Ignore metadata from IDEA (Android Studio)
+*.iml
+.idea/
 bin/
 gen/
 *~

From 8b5580edfe60875943bdc7dca8e20bca4184d562 Mon Sep 17 00:00:00 2001
From: Stephen Beitzel <sbeitzel@pobox.com>
Date: Thu, 1 Aug 2013 14:59:22 -0700
Subject: [PATCH 2/2] Added ScrollView to the login layout as the top
 container. Tested on Droid 3 with API 10.

---
 res/layout/login.xml | 171 ++++++++++++++++++++++---------------------
 1 file changed, 87 insertions(+), 84 deletions(-)

diff --git a/res/layout/login.xml b/res/layout/login.xml
index 35628ca..83081f5 100644
--- a/res/layout/login.xml
+++ b/res/layout/login.xml
@@ -1,100 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+    <RelativeLayout android:layout_width="match_parent"
+                    android:layout_height="wrap_content" >
 
-    <LinearLayout
-        android:id="@+id/sifter_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#FFF"
-        android:orientation="vertical" >
+        <LinearLayout
+                android:id="@+id/sifter_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#FFF"
+                android:orientation="vertical" >
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="15dp" />
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="15dp" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:textColor="#000"
-            android:textSize="30sp" />
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name"
+                    android:textColor="#000"
+                    android:textSize="30sp" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="15dp" />
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="15dp" />
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/image_sifter"
-            android:src="@drawable/sifter135x170" />
+            <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/image_sifter"
+                    android:src="@drawable/sifter135x170" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="15dp" />
-    </LinearLayout>
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="15dp" />
+        </LinearLayout>
 
-    <TextView
-        android:id="@+id/domain_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/sifter_title"
-        android:text="@string/domain" />
+        <TextView
+                android:id="@+id/domain_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/sifter_title"
+                android:text="@string/domain" />
 
-    <EditText
-        android:id="@+id/domain_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/domain_label"
-        android:background="@android:drawable/editbox_background"
-        android:hint="@string/domain_hint" />
+        <EditText
+                android:id="@+id/domain_entry"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/domain_label"
+                android:background="@android:drawable/editbox_background"
+                android:hint="@string/domain_hint" />
 
-    <TextView
-        android:id="@+id/access_key_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/domain_entry"
-        android:text="@string/access_key" />
+        <TextView
+                android:id="@+id/access_key_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/domain_entry"
+                android:text="@string/access_key" />
 
-    <EditText
-        android:id="@+id/access_key_entry"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/access_key_label"
-        android:background="@android:drawable/editbox_background"
-        android:hint="@string/access_key_hint"
-        android:textSize="15sp" />
+        <EditText
+                android:id="@+id/access_key_entry"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/access_key_label"
+                android:background="@android:drawable/editbox_background"
+                android:hint="@string/access_key_hint"
+                android:textSize="15sp" />
 
-    <TextView
-        android:id="@+id/login_error_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/access_key_entry"
-        android:text="@string/login_error" />
+        <TextView
+                android:id="@+id/login_error_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/access_key_entry"
+                android:text="@string/login_error" />
 
-    <TextView
-        android:id="@+id/login_error"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/login_error_label"
-        android:background="@android:drawable/editbox_background"
-        android:textColor="#000" />
+        <TextView
+                android:id="@+id/login_error"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/login_error_label"
+                android:background="@android:drawable/editbox_background"
+                android:textColor="#000" />
 
-    <Button
-        android:id="@+id/save_key"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/login_error"
-        android:layout_alignRight="@id/access_key_entry"
-        android:layout_below="@id/access_key_entry"
-        android:text="@string/save_key" />
+        <Button
+                android:id="@+id/save_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/login_error"
+                android:layout_alignRight="@id/access_key_entry"
+                android:layout_below="@id/access_key_entry"
+                android:text="@string/save_key" />
 
-    <TextView
-        android:id="@+id/login_error_msg"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/login_error" />
+        <TextView
+                android:id="@+id/login_error_msg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/login_error" />
 
-</RelativeLayout>
\ No newline at end of file
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file