From d7c7ccd99b6761b95f48e98b3ce8b6c9a91824b1 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 14 May 2013 11:20:48 +0200
Subject: [PATCH] Added scroll to login view in landscape

---
 res/layout-land/account_setup.xml | 282 ++++++++++++++++++++------------------
 res/layout/account_setup.xml      |   4 +-
 2 files changed, 150 insertions(+), 136 deletions(-)

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index f6a02806..0427dfd2 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center|fill" 
-	android:padding="16dip"
+	android:padding="8dip"
     android:focusable="true"
     >
 
@@ -33,139 +33,152 @@
 		android:orientation="horizontal" 
         >
         
-	<ImageView
-		android:id="@+id/imageView1"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:layout_gravity="center"
-		android:src="@drawable/logo" 
-		/>
-	
-	<LinearLayout
-		android:id="@+id/LinearLayout1"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:layout_gravity="center"
-		android:orientation="vertical" 
-		>
-
-		<FrameLayout
-			android:layout_width="match_parent"
+		<ImageView
+			android:id="@+id/imageView1"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-		>
-
-			<EditText
-				android:id="@+id/hostUrlInput"
+			android:layout_weight="1"
+			android:layout_gravity="center"
+			android:src="@drawable/logo" 
+			/>
+		
+		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+		    xmlns:tools="http://schemas.android.com/tools"
+		    android:layout_width="0dp"
+		    android:layout_height="match_parent"
+			android:layout_weight="1"
+		    android:layout_gravity="center"
+		    android:fillViewport="true"
+		    android:orientation="vertical"
+		    >
+						
+			<LinearLayout
+				android:id="@+id/LinearLayout1"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:ems="10"
-				android:hint="@string/auth_host_url"
-				android:inputType="textUri"
+				android:layout_gravity="center"
+				android:layout_margin="8dp"
+				android:orientation="vertical" 
 				>
-				<requestFocus />
-			</EditText>
-
-			<ImageView
-				android:id="@+id/refreshButton"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="right|center_vertical"
-				android:src="@drawable/ic_action_refresh_black"
-				android:onClick="onRefreshClick"
-				android:visibility="invisible" />
-			
-		</FrameLayout>
-
-		<TextView
-			android:id="@+id/server_status_text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="10dp"
-			android:drawableLeft="@android:drawable/stat_notify_sync"
-			android:drawablePadding="5dp"
-			android:gravity="center_vertical"
-			android:text="@string/auth_testing_connection" />
-             
-		<CheckBox
-			android:id="@+id/oauth_onOff_check"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:checked="false"
-			android:onClick="onCheckClick"
-			android:text="@string/oauth_check_onoff"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:visibility="gone"
-			/>
-
-		<EditText
-			android:id="@+id/oAuthEntryPoint_1"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ems="10"
-			android:enabled="false"
-			android:text="@string/oauth2_url_endpoint_auth"
-			android:singleLine="true"
-			android:inputType="textUri"
-			android:visibility="gone" >
-			<requestFocus />
-		</EditText>            
 		
-		<EditText
-			android:id="@+id/oAuthEntryPoint_2"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ems="10"
-			android:enabled="false"
-			android:text="@string/oauth2_url_endpoint_access"
-			android:singleLine="true"
-			android:inputType="textUri"
-			android:visibility="gone" >
-			<requestFocus />
-		</EditText>            
-
-		<EditText
-			android:id="@+id/account_username"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ems="10"
-			android:hint="@string/auth_username"
-			android:inputType="textNoSuggestions" />
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+				>
+		
+					<EditText
+						android:id="@+id/hostUrlInput"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:ems="10"
+						android:hint="@string/auth_host_url"
+						android:inputType="textUri"
+						>
+						<requestFocus />
+					</EditText>
+		
+					<ImageView
+						android:id="@+id/refreshButton"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="right|center_vertical"
+						android:src="@drawable/ic_action_refresh_black"
+						android:onClick="onRefreshClick"
+						android:visibility="invisible" />
+					
+				</FrameLayout>
+		
+				<TextView
+					android:id="@+id/server_status_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="10dp"
+					android:drawableLeft="@android:drawable/stat_notify_sync"
+					android:drawablePadding="5dp"
+					android:gravity="center_vertical"
+					android:text="@string/auth_testing_connection" />
+		             
+				<CheckBox
+					android:id="@+id/oauth_onOff_check"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:checked="false"
+					android:onClick="onCheckClick"
+					android:text="@string/oauth_check_onoff"
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					android:visibility="gone"
+					/>
+		
+				<EditText
+					android:id="@+id/oAuthEntryPoint_1"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:enabled="false"
+					android:text="@string/oauth2_url_endpoint_auth"
+					android:singleLine="true"
+					android:inputType="textUri"
+					android:visibility="gone" >
+					<requestFocus />
+				</EditText>            
+				
+				<EditText
+					android:id="@+id/oAuthEntryPoint_2"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:enabled="false"
+					android:text="@string/oauth2_url_endpoint_access"
+					android:singleLine="true"
+					android:inputType="textUri"
+					android:visibility="gone" >
+					<requestFocus />
+				</EditText>            
+		
+				<EditText
+					android:id="@+id/account_username"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:hint="@string/auth_username"
+					android:inputType="textNoSuggestions" />
+		
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					>
+					<EditText
+						android:id="@+id/account_password"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:ems="10"
+						android:hint="@string/auth_password"
+						android:inputType="textPassword"/>
+					
+					<ImageView
+						android:id="@+id/viewPasswordButton"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="right|center_vertical"
+						android:src="@android:drawable/ic_menu_view"
+						android:onClick="onViewPasswordClick"
+						android:visibility="invisible" />
+				</FrameLayout>
+		     
+				<TextView
+					android:id="@+id/auth_status_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center_vertical"
+					android:text="@string/auth_unauthorized"
+					android:drawableLeft="@android:drawable/stat_notify_sync"
+					android:drawablePadding="5dip"
+					/>
 
-		<FrameLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			>
-			<EditText
-				android:id="@+id/account_password"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:ems="10"
-				android:hint="@string/auth_password"
-				android:inputType="textPassword"/>
-			
-			<ImageView
-				android:id="@+id/viewPasswordButton"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="right|center_vertical"
-				android:src="@android:drawable/ic_menu_view"
-				android:onClick="onViewPasswordClick"
-				android:visibility="invisible" />
-		</FrameLayout>
-     
-		<TextView
-			android:id="@+id/auth_status_text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical"
-			android:text="@string/auth_unauthorized"
-			android:drawableLeft="@android:drawable/stat_notify_sync"
-			android:drawablePadding="5dip"
-			/>
-	           
-	</LinearLayout>
+			</LinearLayout>
+		
+		</ScrollView>
+						           
 	</LinearLayout>
        
 	<Button
@@ -181,15 +194,16 @@
 
 	<Button
 		android:id="@+id/account_register"
-		android:layout_width="match_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:layout_marginTop="10dp"
 		android:layout_centerHorizontal="true"
-		android:onClick="onRegisterClick"
-		android:textColor="#0000FF"
+		android:layout_alignParentBottom="true"
 		android:background="@android:color/transparent"
+		android:textColor="#0000FF"
+		android:onClick="onRegisterClick"
+		android:paddingTop="5dp"
+		android:paddingBottom="5dp"
 		android:text="@string/auth_register" 
 		/>
-       
+	
 </RelativeLayout>
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 97284912..35449cd7 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -19,7 +19,6 @@
 -->
 
 <ScrollView 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:layout_gravity="center"
@@ -165,11 +164,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
+            android:textColor="#0000FF" 
             android:onClick="onRegisterClick"
             android:paddingBottom="5dp"
             android:paddingTop="5dp"
             android:text="@string/auth_register"
-            android:textColor="#0000FF" />
+            />
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
-- 
2.11.0