addming missing file, show softkeyborad on pin activity and change name activity

diff --git a/res/layout/edit_box_dialog.xml b/res/layout/edit_box_dialog.xml
index 060fafa..c2168ab 100644 (file)
--- a/res/layout/edit_box_dialog.xml
+++ b/res/layout/edit_box_dialog.xml
@@ -1,70 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!-- \r
-  ownCloud Android client application\r
-\r
-  Copyright (C) 2012  Bartek Przybylski\r
-  This program is free software: you can redistribute it and/or modify\r
-  it under the terms of the GNU General Public License as published by\r
-  the Free Software Foundation, either version 3 of the License, or\r
-  (at your option) any later version.\r
-\r
-  This program is distributed in the hope that it will be useful,\r
-  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-  GNU General Public License for more details.\r
-\r
-  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<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
-    android:layout_width="wrap_content"\r
-    android:layout_height="fill_parent"\r
-    android:gravity="center|fill"\r
-    android:orientation="vertical" >\r
-\r
-       <LinearLayout\r
-               android:id="@+id/LinearLayout1"\r
-               android:layout_width="match_parent"\r
-               android:layout_height="wrap_content"\r
-               android:layout_gravity="center_vertical"\r
-               android:layout_weight="1"\r
-               android:orientation="vertical" >\r
-    \r\r
-       <TextView\r
-           android:id="@+id/user_input"\r
-           android:layout_width="wrap_content"\r
-           android:layout_height="wrap_content"\r
-           android:layout_weight="1"\r
-           android:text="new_name" />\r
-    \r
-    </LinearLayout>\r
-    \r
-    <RelativeLayout\r
-        android:layout_width="match_parent"\r
-        android:layout_height="wrap_content"\r
-        android:layout_alignParentBottom="true" >\r
-\r
-        <LinearLayout\r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content"\r
-            android:weightSum="1" >\r
-\r
-            <Button\r
-                android:id="@+id/cancel"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="wrap_content"\r
-                android:layout_weight=".5"\r
-                android:text="@string/common_cancel" />\r
-\r
-            <Button\r
-                android:id="@+id/ok"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="wrap_content"\r
-                android:layout_weight=".5"\r
-                android:text="@string/common_ok"\r
-                android:textColor="@android:color/black" />\r
-\r
-        </LinearLayout>\r
-    </RelativeLayout>\r
-\r
-</LinearLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+    ownCloud Android client application
+
+    Copyright (C) 2012  Bartek Przybylski
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="clip_horizontal"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/user_input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10" >
+
+        <requestFocus />
+    </EditText>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal" >
+
+        <Button
+            android:id="@+id/cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/common_cancel" />
+
+        <Button
+            android:id="@+id/ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/common_ok" />
+
+    </LinearLayout>
+
+</LinearLayout>

diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml
index d1555c9..61645fe 100644 (file)
--- a/res/layout/pincodelock.xml
+++ b/res/layout/pincodelock.xml
@@ -40,7 +40,9 @@
         <EditText\r
             android:id="@+id/txt1"\r
             android:focusable="true"\r
-            style="@style/PassCodeStyle" />\r
+            style="@style/PassCodeStyle"\r
+            android:cursorVisible="true"\r
+            ><requestFocus/></EditText>\r
 \r
         <EditText\r
             android:id="@+id/txt2"\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
index 485cb67..bd81913 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
@@ -21,6 +21,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 import eu.alefzero.owncloud.R;
 
+import android.app.ActionBar.LayoutParams;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -74,6 +75,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         mPinHdr = (TextView) findViewById(R.id.pinHdr);
         mText1 = (EditText) findViewById(R.id.txt1);
         mText1.requestFocus();
+        getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
         mText2 = (EditText) findViewById(R.id.txt2);
         mText3 = (EditText) findViewById(R.id.txt3);
         mText4 = (EditText) findViewById(R.id.txt4);

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 7ac2e98..cf13ba3 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -64,6 +64,7 @@ import android.view.LayoutInflater;
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.view.ViewGroup;\r
+import android.view.WindowManager.LayoutParams;\r
 import android.webkit.MimeTypeMap;\r
 import android.widget.Button;\r
 import android.widget.CheckBox;\r
@@ -726,6 +727,8 @@ public class FileDetailFragment extends SherlockFragment implements
             ((Button)v.findViewById(R.id.cancel)).setOnClickListener(this);\r
             ((Button)v.findViewById(R.id.ok)).setOnClickListener(this);\r
             ((TextView)v.findViewById(R.id.user_input)).setText(currentName);\r
+            ((TextView)v.findViewById(R.id.user_input)).requestFocus();\r
+            getDialog().getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);\r
 \r
             mResult = false;\r
             return v;\r