From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 10 May 2013 14:35:01 +0000 (+0200)
Subject: Review of login view layout optimizing the adaption to different screen sizes
X-Git-Tag: oc-android-1.4.3~24^2~18
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/50d77e8dc83da1f381e77efa48181090db1b7bcb?ds=inline;hp=--cc

Review of login view layout optimizing the adaption to different screen sizes
---

50d77e8dc83da1f381e77efa48181090db1b7bcb
diff --git a/res/drawable-hdpi/logo.png b/res/drawable-hdpi/logo.png
new file mode 100644
index 00000000..ecea3b0e
Binary files /dev/null and b/res/drawable-hdpi/logo.png differ
diff --git a/res/drawable-hdpi/owncloud_logo.png b/res/drawable-hdpi/owncloud_logo.png
deleted file mode 100644
index ecea3b0e..00000000
Binary files a/res/drawable-hdpi/owncloud_logo.png and /dev/null differ
diff --git a/res/drawable-ldpi/logo.png b/res/drawable-ldpi/logo.png
new file mode 100644
index 00000000..62dff255
Binary files /dev/null and b/res/drawable-ldpi/logo.png differ
diff --git a/res/drawable-ldpi/owncloud_logo.png b/res/drawable-ldpi/owncloud_logo.png
deleted file mode 100644
index 62dff255..00000000
Binary files a/res/drawable-ldpi/owncloud_logo.png and /dev/null differ
diff --git a/res/drawable-mdpi/logo.png b/res/drawable-mdpi/logo.png
new file mode 100644
index 00000000..ecea3b0e
Binary files /dev/null and b/res/drawable-mdpi/logo.png differ
diff --git a/res/drawable-mdpi/owncloud_logo.png b/res/drawable-mdpi/owncloud_logo.png
deleted file mode 100644
index ecea3b0e..00000000
Binary files a/res/drawable-mdpi/owncloud_logo.png and /dev/null differ
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index ce78ace5..f6a02806 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -17,222 +17,179 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+<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:padding="16dip"
     android:focusable="true"
-    android:gravity="center|fill"
-    android:orientation="vertical" >
+    >
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_weight="1" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-            <ImageView
-                android:id="@+id/imageView1"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_margin="7dp"
-                android:layout_weight="1"
-                android:src="@drawable/owncloud_logo" />
-
-            <LinearLayout
-                android:id="@+id/LinearLayout1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:orientation="vertical" >
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" >
-
-                    <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="textNoSuggestions">
-                        <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>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_weight="1" >
-
-                    <ImageView
-                        android:id="@+id/action_indicator"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
-                        android:src="@android:drawable/stat_notify_sync"
-                        android:visibility="invisible" />
-
-                    <TextView
-                        android:id="@+id/status_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="TextView"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <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" />
-
-                <TextView
-                    android:id="@+id/textView2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:text="@string/auth_login_details"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_1"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-                	android:enabled="false"
-	                android:text="@string/oauth2_url_endpoint_auth"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_2"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-                	android:enabled="false"
-	                android:text="@string/oauth2_url_endpoint_access"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-                <EditText
-                    android:id="@+id/account_username"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:hint="@string/auth_username"
-                    android:inputType="textNoSuggestions" />
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" >
-
-                    <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:layout_weight="1" 
-	                android:text="@string/text_placeholder"
-	                android:layout_marginLeft="5dp"
-	                android:layout_marginRight="5dp"
-					android:drawableLeft="@android:drawable/stat_notify_sync"
-	    			android:drawablePadding="5dip"
-	    			android:visibility="invisible"                
-	                />
-                
-            </LinearLayout>
-            
-        </LinearLayout>
-    </FrameLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true" >
-
-        <LinearLayout
-            android:id="@+id/buttons_layout"        
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:weightSum="1">
-
-            <Button
-                android:id="@+id/buttonOK"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight=".5"
-                android:layout_marginLeft="16dip"
-		        android:layout_marginRight="16dip"
-                android:enabled="false"
-                android:onClick="onOkClick"
-                android:text="@string/setup_btn_connect"
-                android:textColor="@android:color/black" />
-            
-        </LinearLayout>
+		android:layout_alignParentTop="true"
+		android:layout_above="@+id/buttonOK"
+		android:orientation="horizontal" 
+        >
         
-		<Button
-			android:id="@+id/account_register"
+	<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"
+			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:layout_below="@id/buttons_layout"
-			android:layout_centerHorizontal="true"
-			android:onClick="onRegisterClick"
-			android:paddingTop="10dp"
-			android:paddingBottom="10dp"
-			android:textColor="#0000FF"
-			android:background="@android:color/transparent" />
-			<!-- android:text="@string/app_name @string/auth_register" /-->
-        
-    </RelativeLayout>
+			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" />
 
-</LinearLayout>
+		<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>
+       
+	<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="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:layout_marginTop="10dp"
+		android:layout_centerHorizontal="true"
+		android:onClick="onRegisterClick"
+		android:textColor="#0000FF"
+		android:background="@android:color/transparent"
+		android:text="@string/auth_register" 
+		/>
+       
+</RelativeLayout>
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index d541c099..7171133e 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -18,236 +18,157 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-
 <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:orientation="vertical" >
-
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_gravity="center"
-	    android:focusable="true"
-	    android:gravity="center"
-	    android:orientation="vertical" >
-
-    	<FrameLayout
-			android:layout_width="match_parent"
-			android:layout_height="0dip"
-			android:layout_gravity="center"
-			android:layout_marginBottom="50dip"
-			android:layout_marginLeft="16dip"
-			android:layout_marginRight="16dip"
-			android:layout_weight="1" >
-		
-			<LinearLayout
-				android:id="@+id/LinearLayout1"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:orientation="vertical" >
-		
-				<ImageView
-					android:id="@+id/imageView1"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_weight="1"
-					android:src="@drawable/owncloud_logo" />
-		
-	            <FrameLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" >
-	
-	                <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="textNoSuggestions" >
-	                    <requestFocus />
-	                </EditText>
-	
-	                <ImageView
-	                    android:id="@+id/refreshButton"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:src="@drawable/ic_action_refresh_black"
-	                    android:layout_gravity="right|center_vertical"
-	                    android:visibility="invisible" />
-	
-	            </FrameLayout>
-	
-	            <LinearLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="50dp"
-	                android:layout_weight="1" >
-	
-	                <ImageView
-	                    android:id="@+id/action_indicator"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_marginLeft="5dp"
-	                    android:layout_marginRight="5dp"
-	                    android:src="@android:drawable/stat_notify_sync"
-	                    android:visibility="invisible" />
-	
-	                <TextView
-	                    android:id="@+id/status_text"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:text="TextView"
-	                    android:visibility="invisible" />
-	
-	            </LinearLayout>
-	
-	            <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" />
-	
-				<TextView
-	                android:id="@+id/textView2"
-	                android:layout_width="wrap_content"
-	                android:layout_height="0dp"
-	                android:layout_weight="1"
-	                android:text="@string/auth_login_details"
-	                android:textAppearance="?android:attr/textAppearanceSmall" />
-	
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_1"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-	                android:text="@string/oauth2_url_endpoint_auth"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_2"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-		            android:text="@string/oauth2_url_endpoint_access"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-				<EditText
-	                android:id="@+id/account_username"
-	                android:layout_width="match_parent"
-	                android:layout_height="0dp"
-	                android:layout_weight="1"
-	                android:ems="10"
-	                android:hint="@string/auth_username"
-	                android:inputType="textNoSuggestions" />
-	
-	            <FrameLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" >
-	
-	                <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:layout_weight="1" 
-	                android:text="@string/text_placeholder"
-	                android:layout_marginLeft="5dp"
-	                android:layout_marginRight="5dp"
-					android:drawableLeft="@android:drawable/stat_notify_sync"
-	    			android:drawablePadding="5dip"
-	    			android:visibility="invisible"                
-	                />
-	                    
-	           </LinearLayout>
-	
-	    </FrameLayout>
-	
-	    <RelativeLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content">
-	
-	        <LinearLayout
-	            android:id="@+id/buttons_layout"
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:weightSum="1">
-	
-	            <Button
-	                android:id="@+id/buttonOK"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-		            android:layout_gravity="center_horizontal"
-		           	android:layout_marginLeft="16dip"
-		            android:layout_marginRight="16dip"
-	                android:enabled="false"
-	                android:onClick="onOkClick"
-	                android:text="@string/setup_btn_connect"
-	                android:textColor="@android:color/black" />
-	
-	        </LinearLayout>
-	        
-			<Button
-				android:id="@+id/account_register"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/buttons_layout"
-				android:layout_centerHorizontal="true"
-				android:onClick="onRegisterClick"
-				android:paddingTop="10dp"
-				android:paddingBottom="10dp"
-				android:textColor="#0000FF"
-				android:background="@android:color/transparent" />
-			
-			<Button
-				android:id="@+id/account_register"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/buttons_layout"
-				android:layout_centerHorizontal="true"
-				android:onClick="onRegisterClick"
-				android:paddingTop="10dp"
-				android:paddingBottom="10dp"
-				android:textColor="#0000FF"
-				android:background="@android:color/transparent" />
-				<!-- android:text="@string/app_name @string/auth_register" /-->
-	        
-	    </RelativeLayout>
-
-	</LinearLayout>
-			
-</ScrollView>
+    android:layout_gravity="center"
+	android:padding="16dip"
+    android:fillViewport="true"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical" 
+        android:focusable="true"
+        >
+
+        <ImageView
+            android:id="@+id/imageView1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:src="@drawable/logo" />
+
+        <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: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:inputType="textUri"
+            android:singleLine="true"
+            android:text="@string/oauth2_url_endpoint_auth"
+            android:visibility="gone" >
+        </EditText>
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textUri"
+            android:singleLine="true"
+            android:text="@string/oauth2_url_endpoint_access"
+            android:visibility="gone" />
+
+        <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:onClick="onViewPasswordClick"
+                android:src="@android:drawable/ic_menu_view"
+                android:visibility="invisible" />
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/auth_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_unauthorized" />
+
+        <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"
+            android:textColor="@android:color/black" />
+
+        <Button
+            android:id="@+id/account_register"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:onClick="onRegisterClick"
+            android:paddingBottom="10dp"
+            android:paddingTop="10dp"
+            android:text="@string/auth_register"
+            android:textColor="#0000FF" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/file_preview.xml b/res/layout/file_preview.xml
index 22528a78..ec69fe7d 100644
--- a/res/layout/file_preview.xml
+++ b/res/layout/file_preview.xml
@@ -42,7 +42,7 @@
 	        android:layout_margin="16dp"
 	        android:layout_gravity="center"
 	        android:contentDescription="@string/preview_image_description"
-	        android:src="@drawable/owncloud_logo" />
+	        android:src="@drawable/logo" />
 	    
 	   	<VideoView  
 	   	    android:id="@+id/video_preview"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7520dc60..2d6de4b6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -200,7 +200,6 @@
     <string name="auth_bad_oc_version_title">Unrecognized server version</string>
     <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
     <string name="auth_secure_connection">Secure connection established</string>
-    <string name="auth_login_details">Login details</string>
     <string name="auth_unauthorized">Invalid credentials</string>
 	<string name="auth_oauth_error">Unsuccessful authorization</string>
 	<string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index ef5c21b5..e4787fb4 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -178,6 +178,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mStatusText = mStatusIcon = 0;
             mStatusCorrect = false;
             mIsSslConn = false;
+            updateConnStatus();
+            updateAuthStatus();
             
             /// retrieve extras from intent
             String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);
@@ -270,7 +272,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         updateConnStatus();
         
         /// UI settings depending upon connection
-        mOkButton.setEnabled(mStatusCorrect);   // TODO really necessary?
+        mOkButton.setEnabled(mStatusCorrect);  
         if (!mStatusCorrect)
             mRefreshButton.setVisibility(View.VISIBLE); // seems that setting visibility is necessary
         else
@@ -347,7 +349,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
         /// GET ACCESS TOKEN to the oAuth server 
         RemoteOperation operation = new OAuth2GetAccessToken(   getString(R.string.oauth2_client_id), 
-                                                                getString(R.string.oauth2_redirect_uri), // TODO check - necessary here?      
+                                                                getString(R.string.oauth2_redirect_uri),       
                                                                 getString(R.string.oauth2_grant_type),
                                                                 queryParameters);
         //WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());
@@ -964,16 +966,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * to the last check on the ownCloud server.
      */
     private void updateConnStatus() {
-        ImageView iv = (ImageView) findViewById(R.id.action_indicator);
-        TextView tv = (TextView) findViewById(R.id.status_text);
+        TextView tv = (TextView) findViewById(R.id.server_status_text);
 
         if (mStatusIcon == 0 && mStatusText == 0) {
-            iv.setVisibility(View.INVISIBLE);
             tv.setVisibility(View.INVISIBLE);
         } else {
-            iv.setImageResource(mStatusIcon);
             tv.setText(mStatusText);
-            iv.setVisibility(View.VISIBLE);
+            tv.setCompoundDrawablesWithIntrinsicBounds(mStatusIcon, 0, 0, 0);
             tv.setVisibility(View.VISIBLE);
         }
     }