X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0583bc8b33e4f337c6446ddea2cc1d7545cbc3ec..a032bdeebc51a6e81d1bd5c558944f96fc55eacb:/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
index 1b0819e2..2253d167 100644
--- a/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/PinCodeActivity.java
@@ -96,7 +96,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         // Not PIN Code defined yet.
         // In a previous version settings is allow from start
         if ( (appPrefs.getString("PrefPinCode1", null) == null ) ){
-            setInitView();
+            setChangePincodeView(true);
             pinCodeChecked = true; 
             newPasswordEntered = true;
             
@@ -193,11 +193,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                       tempText[0] = mText1.getText().toString();
                       
                    }
-                                                        
-                   mText1.setTransformationMethod(new PasswordTransformationMethod());                  
                    mText2.requestFocus();
-
-                   
                 }
             }
 
@@ -279,8 +275,13 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             public void onFocusChange(View v, boolean hasFocus) {
                 // TODO Auto-generated method stub
                 
+                mText2.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
+                    mText2.setSelected(false);
+                    mText2.setCursorVisible(false);
                     mText1.requestFocus(); 
+                    mText1.setSelected(true);
+                    mText1.setSelection(0);
                 }
                 
             }
@@ -345,11 +346,19 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 // TODO Auto-generated method stub
-
+                mText3.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
-                    mText1.requestFocus(); 
+                    mText3.setSelected(false);
+                    mText3.setCursorVisible(false);
+                    mText1.requestFocus();
+                    mText1.setSelected(true);
+                    mText1.setSelection(0);
                 }else if (mText2.getText().toString().equals("")){
-                    mText2.requestFocus(); 
+                    mText3.setSelected(false);
+                    mText3.setCursorVisible(false);
+                    mText2.requestFocus();
+                    mText2.setSelected(true);
+                    mText2.setSelection(0);
                 }
                 
             }
@@ -448,13 +457,27 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 // TODO Auto-generated method stub
-               
+                
+                mText4.setCursorVisible(true);
+                
                 if (mText1.getText().toString().equals("")){
-                    mText1.requestFocus(); 
+                    mText4.setSelected(false);
+                    mText4.setCursorVisible(false);
+                    mText1.requestFocus();
+                    mText1.setSelected(true);
+                    mText1.setSelection(0);
                 }else if (mText2.getText().toString().equals("")){
-                    mText2.requestFocus(); 
+                    mText4.setSelected(false);
+                    mText4.setCursorVisible(false);
+                    mText2.requestFocus();
+                    mText2.setSelected(true);
+                    mText2.setSelection(0);
                 }else if (mText3.getText().toString().equals("")){
-                    mText3.requestFocus(); 
+                    mText4.setSelected(false);
+                    mText4.setCursorVisible(false);
+                    mText3.requestFocus();
+                    mText3.setSelected(true);
+                    mText3.setSelection(0);
                 }
                 
             }