From: masensio <masensio@solidgear.es>
Date: Mon, 10 Jun 2013 11:19:11 +0000 (+0200)
Subject: Merge OC-297
X-Git-Tag: oc-android-1.4.3~22^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/472b6b48bfa33dac02d12a0d09e91dfd675569a8?ds=inline;hp=--cc

Merge OC-297
---

472b6b48bfa33dac02d12a0d09e91dfd675569a8
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e92554ba,919a40ad..b4b1c6b6
--- a/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";
      private static final String KEY_SERVER_STATUS_ICON = "SERVER_STATUS_ICON";
      private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";
+     private static final String KEY_PASSWORD_VISIBLE = "PASSWORD_VISIBLE";
      private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";
      private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";
 +    private static final String KEY_REFRESH_BUTTON_ENABLED = "KEY_REFRESH_BUTTON_ENABLED";
  
      private static final String OAUTH_MODE_ON = "on";
      private static final String OAUTH_MODE_OFF = "off";
@@@ -289,8 -286,16 +292,16 @@@
          });
          mPasswordInput.setOnFocusChangeListener(this);
          mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
--        mPasswordInput.setOnEditorActionListener(this);
- 
++        mPasswordInput.setOnEditorActionListener(this);
+         mPasswordInput.setOnTouchListener(new RightDrawableOnTouchListener() {
+             @Override
+             public boolean onDrawableTouch(final MotionEvent event) {
+                 if (event.getAction() == MotionEvent.ACTION_UP) {
+                     AuthenticatorActivity.this.onViewPasswordClick();
+                 }
+                 return true;
+             }
 -        });
++        });
      }
  
      /**