Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update

[pub/Android/ownCloud.git] / res / layout / account_setup.xml

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 1c7921d..1f712ee 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application\r
 \r
   Copyright (C) 2012  Bartek Przybylski\r
-  Copyright (C) 2012-2013 ownCloud Inc.\r
+  Copyright (C) 2015 ownCloud Inc.\r
 \r
   This program is free software: you can redistribute it and/or modify\r
   it under the terms of the GNU General Public License version 2,\r
@@ -22,41 +22,70 @@
     android:layout_height="match_parent"\r
     android:layout_gravity="center"\r
     android:fillViewport="true"\r
-    android:orientation="vertical" >\r
+    android:orientation="vertical" \r
+    android:id="@+id/scroll"\r
+    >\r
 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
-        android:focusable="true"\r
+        android:background="@color/login_background_color"\r
         android:gravity="center"\r
         android:orientation="vertical"\r
         android:padding="8dp" >\r
 \r
         <ImageView\r
-            android:id="@+id/imageView1"\r
+            android:id="@+id/thumbnail"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:layout_marginBottom="10dp"\r
             android:layout_marginTop="10dp"\r
-            android:src="@drawable/logo" />\r
+            android:background="@color/login_logo_background_color"\r
+            android:src="@drawable/logo"\r
+            android:contentDescription="@string/app_name"/>\r
+\r
+        <Button\r
+            android:id="@+id/centeredRefreshButton"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="wrap_content"\r
+            android:layout_gravity="center_horizontal"\r
+            android:layout_marginBottom="10dp"\r
+            android:onClick="onRefreshClick"\r
+            android:text="@string/auth_check_server"\r
+            android:visibility="gone"\r
+            android:contentDescription="@string/auth_check_server"/>\r
+        \r
+        <TextView\r
+            android:id="@+id/instructions_message"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="wrap_content"\r
+            android:layout_gravity="fill_horizontal"\r
+            android:text="@string/auth_expired_basic_auth_toast"\r
+            android:visibility="gone"\r
+            android:layout_marginBottom="10dp"\r
+            android:contentDescription="@string/auth_expired_basic_auth_toast"/>\r
 \r
            <FrameLayout \r
+               android:id="@+id/hostUrlFrame"\r
                        android:layout_width="match_parent"\r
                        android:layout_height="wrap_content"\r
+            android:layout_marginBottom="10dp"\r
                >\r
                        <EditText\r
                                android:id="@+id/hostUrlInput"\r
                                android:layout_width="match_parent"\r
                                android:layout_height="wrap_content"\r
+                               android:layout_gravity="bottom"\r
                                android:hint="@string/auth_host_url"\r
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
+                               android:contentDescription="@string/auth_host_address"\r
                                >\r
                                <requestFocus />\r
                        </EditText>\r
                        <ImageButton\r
-                           android:id="@+id/refeshButton"\r
+                           android:id="@+id/embeddedRefreshButton"\r
                            android:layout_width="48dp"\r
                            android:layout_height="48dp"\r
                            android:layout_gravity="center_vertical|right"\r
@@ -67,6 +96,7 @@
                android:onClick="onRefreshClick"\r
                                android:visibility="gone"\r
                                android:background="@android:color/transparent"\r
+                android:contentDescription="@string/auth_refresh_button"\r
                            />\r
                </FrameLayout>\r
 \r
@@ -78,7 +108,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
-            android:text="@string/auth_testing_connection" />\r
+            android:text="@string/auth_testing_connection"\r
+            android:contentDescription="@string/auth_testing_connection"/>\r
 \r
         <CheckBox\r
             android:id="@+id/oauth_onOff_check"\r
@@ -88,17 +119,19 @@
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r
-            android:visibility="gone" />\r
+            android:contentDescription="@string/oauth_check_onoff"\r
+            />\r
 \r
         <EditText\r
             android:id="@+id/oAuthEntryPoint_1"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
-            android:inputType="textUri"\r
-            android:singleLine="true"\r
+                       android:enabled="false"\r
             android:text="@string/oauth2_url_endpoint_auth"\r
-            android:visibility="gone" >\r
+            android:singleLine="true"\r
+            android:inputType="textUri"\r
+            android:visibility="gone">\r
         </EditText>\r
 \r
         <EditText\r
@@ -106,10 +139,11 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
-            android:inputType="textUri"\r
-            android:singleLine="true"\r
+                       android:enabled="false"\r
             android:text="@string/oauth2_url_endpoint_access"\r
-            android:visibility="gone" />\r
+            android:singleLine="true"\r
+            android:inputType="textUri"\r
+            android:visibility="gone"/>\r
 \r
         <EditText\r
             android:id="@+id/account_username"\r
@@ -117,7 +151,9 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
             android:hint="@string/auth_username"\r
-            android:inputType="textNoSuggestions" />\r
+            android:inputType="textNoSuggestions"\r
+            android:contentDescription="@string/auth_username"\r
+                       />\r
 \r
                <EditText\r
                    android:id="@+id/account_password"\r
@@ -126,7 +162,9 @@
                    android:drawablePadding="5dp"\r
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
-                   android:inputType="textPassword" />\r
+                   android:inputType="textPassword"\r
+                   android:contentDescription="@string/auth_password"\r
+            />\r
         \r
         <TextView\r
             android:id="@+id/auth_status_text"\r
@@ -136,7 +174,8 @@
             android:drawableLeft="@android:drawable/stat_notify_sync"\r
             android:drawablePadding="5dp"\r
             android:gravity="center_vertical"\r
-            android:text="@string/auth_unauthorized" />\r
+            android:text="@string/auth_unauthorized"\r
+            android:contentDescription="@string/auth_unauthorized"/>\r
 \r
         <Button\r
             android:id="@+id/buttonOK"\r
@@ -146,19 +185,20 @@
             android:enabled="false"\r
             android:onClick="onOkClick"\r
             android:text="@string/setup_btn_connect"\r
-            />\r
+            android:contentDescription="@string/setup_btn_connect"/>\r
 \r
         <Button\r
-            android:id="@+id/account_register"\r
+            android:id="@+id/welcome_link"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:background="@android:color/transparent"\r
-            android:textColor="#0000FF" \r
             android:onClick="onRegisterClick"\r
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
-            />\r
+            android:textColor="#0000FF"\r
+            android:contentDescription="@string/auth_register"/>\r
+\r
     </LinearLayout>\r
 \r
 </ScrollView>
\ No newline at end of file