Cleaning-up AuthenticatorActivty code

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

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index d68feea..b30c515 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -58,7 +58,7 @@
                     android:layout_weight="1" >
 
                     <EditText
-                        android:id="@+id/host_URL"
+                        android:id="@+id/hostUrlInput"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -74,6 +74,7 @@
                         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>
 
@@ -104,7 +105,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:checked="false"
-                    android:onClick="onOff_check_Click"
+                    android:onClick="onCheckClick"
                     android:text="@string/oauth_check_onoff"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -116,19 +117,34 @@
                     android:text="@string/auth_login_details"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                <EditText
-                    android:id="@+id/oAuth_URL"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:hint="@string/oauth_host_url"
-                    android:singleLine="true"
-                    android:visibility="gone" >
-
-                    <requestFocus />
-                </EditText>
-                
+                   <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/oauth_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/oauth_url_endpoint_access"
+                       android:singleLine="true"
+                       android:visibility="gone" >
+       
+                       <requestFocus />
+                   </EditText>            
+       
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -175,11 +191,12 @@
                         android:inputType="textPassword"/>
 
                     <ImageView
-                        android:id="@+id/viewPassword"
+                        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>
             </LinearLayout>