Fix crash in navigation in FileList

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index a0d5470..830dd55 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
   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
 \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


@@ -35,11 +35,12 @@
         android:padding="8dp" >\r
 \r
         <ImageView\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:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:layout_marginBottom="10dp"\r
             android:layout_marginTop="10dp"\r

+            android:background="@color/login_logo_background_color"\r

             android:src="@drawable/logo" />\r
 \r
         <Button\r
             android:src="@drawable/logo" />\r
 \r
         <Button\r


@@ -53,7 +54,7 @@
             android:visibility="gone" />\r
         \r
         <TextView\r
             android:visibility="gone" />\r
         \r
         <TextView\r

-            android:id="@+id/auth_message"\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:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="fill_horizontal"\r


@@ -166,19 +167,17 @@
             android:gravity="center_vertical"\r
             android:text="@string/auth_unauthorized" />\r
 \r
             android:gravity="center_vertical"\r
             android:text="@string/auth_unauthorized" />\r
 \r

-        <com.owncloud.android.ui.CustomButton\r
+        <Button\r

             android:id="@+id/buttonOK"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:id="@+id/buttonOK"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r

-            android:background="@android:drawable/btn_default"\r

             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r

-            android:text="@string/setup_btn_connect"\r
-            />\r
+            android:text="@string/setup_btn_connect" />\r

 \r
         <Button\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:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:background="@android:color/transparent"\r


@@ -186,8 +185,7 @@
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r

-            android:textColor="#0000FF"\r
-            android:visibility="gone" />\r
+            android:textColor="#0000FF"/>\r

 \r
     </LinearLayout>\r
 \r
 \r
     </LinearLayout>\r
 \r