make cancel button usable on account create activity

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a7ef3d0..13e401d 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.123B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.124B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 1a9e281..add258c 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -159,6 +159,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight=".5"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight=".5"

+                android:onClick="onCancelClick"

                 android:text="@string/common_cancel" />
 
             <Button
                 android:text="@string/common_cancel" />
 
             <Button

diff --git a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
index 77490eb..bd0ddb0 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
@@ -221,7 +221,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             tv.setError(message);\r
         }\r
     }\r
             tv.setError(message);\r
         }\r
     }\r

-\r
+    public void onCancelClick(View view) {\r
+        finish();\r
+    }\r
+    \r

     public void onOkClick(View view) {\r
         String prefix = "";\r
         String url = ((TextView) findViewById(R.id.host_URL)).getText()\r
     public void onOkClick(View view) {\r
         String prefix = "";\r
         String url = ((TextView) findViewById(R.id.host_URL)).getText()\r