Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement

diff --combined src/com/owncloud/android/ui/activity/PassCodeActivity.java
index f6b5aff,5a57669..00cf1f0
--- 1/src/com/owncloud/android/ui/activity/PassCodeActivity.java
--- 2/src/com/owncloud/android/ui/activity/PassCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PassCodeActivity.java
@@@ -175,8 -175,12 +175,8 @@@ public class PassCodeActivity extends S
              public void onFocusChange(View v, boolean hasFocus) {
                  /// TODO WIP: should take advantage of hasFocus to reduce processing
                  if (mPassCodeEditTexts[0].getText().toString().equals("")) {    // TODO WIP validation could be done in a global way, with a single OnFocusChangeListener for all the input fields
 -                    //mPassCodeEditTexts[1].setSelected(false);
                      mPassCodeEditTexts[0].requestFocus();
 -                    //mPassCodeEditTexts[0].setSelected(true);   // TODO WIP really needed? is it for the colour highlight
 -                    //mPassCodeEditTexts[0].setSelection(0);     // TODO WIP what is THIS for?
                  }
 -
              }
          });
          
@@@ -210,10 -214,17 +210,10 @@@
              @Override
              public void onFocusChange(View v, boolean hasFocus) {
                  if (mPassCodeEditTexts[0].getText().toString().equals("")) {
 -                    //mPassCodeEditTexts[2].setSelected(false);
                      mPassCodeEditTexts[0].requestFocus();
 -                    //mPassCodeEditTexts[0].setSelected(true);
 -                    //mPassCodeEditTexts[0].setSelection(0);
                  } else if (mPassCodeEditTexts[1].getText().toString().equals("")) {
 -                    //mPassCodeEditTexts[2].setSelected(false);
                      mPassCodeEditTexts[1].requestFocus();
 -                    //mPassCodeEditTexts[1].setSelected(true);
 -                    //mPassCodeEditTexts[1].setSelection(0);
                  }
 -
              }
          });
  
@@@ -247,11 -258,20 +247,11 @@@
              public void onFocusChange(View v, boolean hasFocus) {
  
                  if (mPassCodeEditTexts[0].getText().toString().equals("")) {
 -                    //mPassCodeEditTexts[3].setSelected(false);
                      mPassCodeEditTexts[0].requestFocus();
 -                    //mPassCodeEditTexts[0].setSelected(true);
 -                    //mPassCodeEditTexts[0].setSelection(0);
                  } else if (mPassCodeEditTexts[1].getText().toString().equals("")) {
 -                    //mPassCodeEditTexts[3].setSelected(false);
                      mPassCodeEditTexts[1].requestFocus();
 -                    //mPassCodeEditTexts[1].setSelected(true);
 -                    //mPassCodeEditTexts[1].setSelection(0);
                  } else if (mPassCodeEditTexts[2].getText().toString().equals("")) {
 -                    //mPassCodeEditTexts[3].setSelected(false);
                      mPassCodeEditTexts[2].requestFocus();
 -                    //mPassCodeEditTexts[2].setSelected(true);
 -                    //mPassCodeEditTexts[2].setSelection(0);
                  }
  
              }
@@@ -273,8 -293,7 +273,7 @@@
                  finish();
  
              }  else {
-                 showErrorAndRestart(R.string.common_error, R.string.pass_code_enter_pass_code, View.INVISIBLE);
-                     /// TODO better error message
+                 showErrorAndRestart(R.string.pass_code_wrong, R.string.pass_code_enter_pass_code, View.INVISIBLE);
              }
  
          } else if (ACTION_DISABLE.equals(getIntent().getAction())) {
@@@ -289,8 -308,7 +288,7 @@@
                  finish();
  
              } else {
-                 showErrorAndRestart(R.string.common_error, R.string.pass_code_enter_pass_code, View.INVISIBLE);
-                     /// TODO better error message
+                 showErrorAndRestart(R.string.pass_code_wrong, R.string.pass_code_enter_pass_code, View.INVISIBLE);
              }
  
          } else if (ACTION_ENABLE.equals(getIntent().getAction())) {