Add a log and a comment

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 7cac19e..52a8ed2 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -22,12 +22,13 @@
     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:gravity="center"\r
         android:orientation="vertical"\r
         android:padding="8dp" >\r
@@ -49,6 +50,15 @@
             android:onClick="onRefreshClick"\r
             android:text="@string/auth_check_server"\r
             android:visibility="gone" />\r
+        \r
+        <TextView\r
+            android:id="@+id/auth_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
 \r
            <FrameLayout \r
                android:id="@+id/hostUrlFrame"\r
@@ -127,21 +137,6 @@
             android:visibility="gone" />\r
 \r
         <EditText\r
-            android:id="@+id/account_name"\r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content"\r
-            android:ems="10"\r
-            android:hint="@string/auth_account_name"\r
-            android:inputType="textNoSuggestions" \r
-            android:visibility="gone" />\r
-        \r
-        <WebView\r
-            android:id="@+id/web_sso_view" \r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content"\r
-            android:visibility="gone" />\r
-\r
-        <EditText\r
             android:id="@+id/account_username"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r