OC-575: Update the size of a folder in DB during the sync. OC-523

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

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 7171133..a218fa9 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -17,24 +17,20 @@
   You should have received a copy of the GNU General Public License\r
   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 -->\r
-\r
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"\r
-    xmlns:tools="http://schemas.android.com/tools"\r
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
     android:layout_gravity="center"\r
-       android:padding="16dip"\r
     android:fillViewport="true"\r
-    android:orientation="vertical"\r
-    >\r
+    android:orientation="vertical" >\r
 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
-        android:gravity="center"\r
-        android:orientation="vertical" \r
         android:focusable="true"\r
-        >\r
+        android:gravity="center"\r
+        android:orientation="vertical"\r
+        android:padding="8dp" >\r
 \r
         <ImageView\r
             android:id="@+id/imageView1"\r
@@ -44,29 +40,17 @@
             android:layout_marginTop="10dp"\r
             android:src="@drawable/logo" />\r
 \r
-        <FrameLayout\r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content" >\r
-\r
-            <EditText\r
-                android:id="@+id/hostUrlInput"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="wrap_content"\r
-                android:ems="10"\r
-                android:hint="@string/auth_host_url"\r
-                android:inputType="textUri" >\r
-\r
-                <requestFocus />\r
-            </EditText>\r
-\r
-            <ImageView\r
-                android:id="@+id/refreshButton"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:layout_gravity="right|center_vertical"\r
-                android:src="@drawable/ic_action_refresh_black"\r
-                android:visibility="invisible" />\r
-        </FrameLayout>\r
+               <EditText\r
+                       android:id="@+id/hostUrlInput"\r
+                       android:layout_width="match_parent"\r
+                       android:layout_height="wrap_content"\r
+                       android:ems="10"\r
+                       android:hint="@string/auth_host_url"\r
+                       android:inputType="textUri"\r
+                       android:drawablePadding="5dp"\r
+                       >\r
+                       <requestFocus />\r
+               </EditText>\r
 \r
         <TextView\r
             android:id="@+id/server_status_text"\r
@@ -117,28 +101,15 @@
             android:hint="@string/auth_username"\r
             android:inputType="textNoSuggestions" />\r
 \r
-        <FrameLayout\r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content" >\r
-\r
-            <EditText\r
-                android:id="@+id/account_password"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="wrap_content"\r
-                android:ems="10"\r
-                android:hint="@string/auth_password"\r
-                android:inputType="textPassword" />\r
-\r
-            <ImageView\r
-                android:id="@+id/viewPasswordButton"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:layout_gravity="right|center_vertical"\r
-                android:onClick="onViewPasswordClick"\r
-                android:src="@android:drawable/ic_menu_view"\r
-                android:visibility="invisible" />\r
-        </FrameLayout>\r
-\r
+               <EditText\r
+                   android:id="@+id/account_password"\r
+                   android:layout_width="match_parent"\r
+                   android:layout_height="wrap_content"\r
+                   android:drawablePadding="5dp"\r
+                   android:ems="10"\r
+                   android:hint="@string/auth_password"\r
+                   android:inputType="textPassword" />\r
+        \r
         <TextView\r
             android:id="@+id/auth_status_text"\r
             android:layout_width="match_parent"\r
@@ -157,18 +128,19 @@
             android:enabled="false"\r
             android:onClick="onOkClick"\r
             android:text="@string/setup_btn_connect"\r
-            android:textColor="@android:color/black" />\r
+            />\r
 \r
         <Button\r
             android:id="@+id/account_register"\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="10dp"\r
-            android:paddingTop="10dp"\r
+            android:paddingBottom="5dp"\r
+            android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
-            android:textColor="#0000FF" />\r
+            />\r
     </LinearLayout>\r
 \r
 </ScrollView>
\ No newline at end of file