X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d7c7ccd99b6761b95f48e98b3ce8b6c9a91824b1..1ace8a21efd5b5d5ff371cfca652eaa98b63b0ef:/res/layout-land/account_setup.xml

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 0427dfd2..4eea9b36 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -20,18 +20,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center|fill" 
+    android:background="@color/login_background_color"
 	android:padding="8dip"
-    android:focusable="true"
     >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:layout_above="@+id/buttonOK"
-		android:orientation="horizontal" 
-        >
+        android:layout_above="@+id/bottom_block"
+        android:layout_alignParentTop="true"
+        android:orientation="horizontal" >
         
 		<ImageView
 			android:id="@+id/imageView1"
@@ -39,53 +37,74 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:layout_gravity="center"
+			android:background="@color/login_logo_background_color"
 			android:src="@drawable/logo" 
 			/>
 		
-		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-		    xmlns:tools="http://schemas.android.com/tools"
+		<ScrollView
 		    android:layout_width="0dp"
 		    android:layout_height="match_parent"
-			android:layout_weight="1"
-		    android:layout_gravity="center"
+		    android:layout_weight="1"
+		    android:id="@+id/scroll"
 		    android:fillViewport="true"
-		    android:orientation="vertical"
-		    >
+		    android:orientation="vertical" >
 						
 			<LinearLayout
-				android:id="@+id/LinearLayout1"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:layout_margin="8dp"
-				android:orientation="vertical" 
-				>
-		
-				<FrameLayout
+			    android:id="@+id/LinearLayout1"
+			    android:layout_width="match_parent"
+			    android:layout_height="wrap_content"
+			    android:gravity="center"
+			    android:orientation="vertical"
+			    android:padding="8dp" >
+			    
+				<Button
+				    android:id="@+id/centeredRefreshButton"
+				    android:layout_width="wrap_content"
+				    android:layout_height="wrap_content"
+				    android:layout_gravity="center_horizontal"
+					android:layout_marginBottom="10dp"
+            		android:onClick="onRefreshClick"
+				    android:text="@string/auth_check_server"
+				    android:visibility="gone" />
+				<TextView
+				    android:id="@+id/auth_message"
+				    android:layout_width="wrap_content"
+				    android:layout_height="wrap_content"
+				    android:layout_gravity="fill_horizontal"
+				    android:text="@string/auth_expired_basic_auth_toast" 
+				    android:visibility="gone"
+				    android:layout_marginBottom="10dp"/>
+			    <FrameLayout 
+	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-				>
-		
+					android:layout_marginBottom="10dp"
+			        >
 					<EditText
 						android:id="@+id/hostUrlInput"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:ems="10"
+						android:layout_gravity="bottom"
 						android:hint="@string/auth_host_url"
 						android:inputType="textUri"
+						android:drawablePadding="5dp"
+						android:paddingRight="55dp"
 						>
 						<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" />
-					
+					<ImageButton
+					    android:id="@+id/embeddedRefreshButton"
+					    android:layout_width="48dp"
+					    android:layout_height="48dp"
+					    android:layout_gravity="center_vertical|right"
+					    android:layout_marginRight="5dp"
+					    android:padding="0dp"
+					    android:scaleType="fitCenter"
+					    android:src="@drawable/ic_action_refresh_black"
+            			android:onClick="onRefreshClick"
+					    android:visibility="gone"
+						android:background="@android:color/transparent"
+					    />
 				</FrameLayout>
 		
 				<TextView
@@ -106,7 +125,6 @@
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
 					android:textAppearance="?android:attr/textAppearanceSmall"
-					android:visibility="gone"
 					/>
 		
 				<EditText
@@ -119,7 +137,6 @@
 					android:singleLine="true"
 					android:inputType="textUri"
 					android:visibility="gone" >
-					<requestFocus />
 				</EditText>            
 				
 				<EditText
@@ -143,28 +160,16 @@
 					android:hint="@string/auth_username"
 					android:inputType="textNoSuggestions" />
 		
-				<FrameLayout
+				<EditText
+				    android:id="@+id/account_password"
 					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>
-		     
+					android:ems="10"
+					android:hint="@string/auth_password"
+					android:inputType="textPassword"
+					android:drawablePadding="5dp"
+					/>
+		        
 				<TextView
 					android:id="@+id/auth_status_text"
 					android:layout_width="match_parent"
@@ -181,29 +186,33 @@
 						           
 	</LinearLayout>
        
-	<Button
-		android:id="@id/buttonOK"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_above="@id/account_register"
-		android:layout_centerHorizontal="true"
-		android:enabled="false"
-		android:onClick="onOkClick"
-		android:text="@string/setup_btn_connect"
-		/>
-
-	<Button
-		android:id="@+id/account_register"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerHorizontal="true"
+    <LinearLayout
+        android:id="@id/bottom_block"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
 		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" 
-		/>
-	
+        android:orientation="vertical" >
+        
+		<Button
+		    android:id="@+id/buttonOK"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_gravity="center_horizontal"
+		    android:enabled="false"
+		    android:onClick="onOkClick"
+		    android:text="@string/setup_btn_connect" />
+		
+		<Button
+		    android:id="@+id/welcome_link"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:layout_gravity="center_horizontal"
+		    android:background="@android:color/transparent"
+		    android:onClick="onRegisterClick"
+		    android:paddingBottom="5dp"
+		    android:paddingTop="5dp"
+		    android:text="@string/auth_register"
+		    android:textColor="#0000FF"/>
+	</LinearLayout>
+		
 </RelativeLayout>