Merge OC-297

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e92554b,919a40a..b4b1c6b
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -95,9 -94,9 +94,10 @@@ implements  OnRemoteOperationListener, 
      private static final String KEY_SERVER_STATUS_TEXT = "SERVER_STATUS_TEXT";\r
      private static final String KEY_SERVER_STATUS_ICON = "SERVER_STATUS_ICON";\r
      private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";\r
+     private static final String KEY_PASSWORD_VISIBLE = "PASSWORD_VISIBLE";\r
      private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";\r
      private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";\r
 +    private static final String KEY_REFRESH_BUTTON_ENABLED = "KEY_REFRESH_BUTTON_ENABLED";\r
  \r
      private static final String OAUTH_MODE_ON = "on";\r
      private static final String OAUTH_MODE_OFF = "off";\r
@@@ -289,8 -286,16 +292,16 @@@
          });\r
          mPasswordInput.setOnFocusChangeListener(this);\r
          mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);\r
--        mPasswordInput.setOnEditorActionListener(this);\r
- \r
++        mPasswordInput.setOnEditorActionListener(this);
+         mPasswordInput.setOnTouchListener(new RightDrawableOnTouchListener() {\r
+             @Override\r
+             public boolean onDrawableTouch(final MotionEvent event) {\r
+                 if (event.getAction() == MotionEvent.ACTION_UP) {\r
+                     AuthenticatorActivity.this.onViewPasswordClick();\r
+                 }\r
+                 return true;\r
+             }\r
 -        });\r
++        });
      }\r
  \r
      /**\r