diff --git a/android/app/build.gradle b/android/app/build.gradle
index d3463411b8..24c067b176 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -133,6 +133,10 @@ dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:design:26.1.0'
+ compile 'com.android.support:support-v4:26.1.0'
+ compile 'com.android.support:appcompat-v7:26.1.0'
+ compile 'com.android.support:support-vector-drawable:26.1.0'
+
implementation 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:recyclerview-v7:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0'
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
index 1a030baabf..92cdec19a1 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
@@ -8,9 +8,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -62,44 +59,6 @@ public class LoginFragment extends Fragment {
mLoginButton = rootView.findViewById(R.id.loginButton);
mForgotPassword = rootView.findViewById(R.id.forgotPassword);
- mUsername.addTextChangedListener(new TextWatcher() {
- boolean ignoreNextChange = false;
- boolean hadBlankSpace = false;
- @Override
- public void beforeTextChanged(CharSequence charSequence, int start, int count, int after) {
- hadBlankSpace = charSequence.length() > 0 && charSequence.charAt(charSequence.length()-1) == ' ';
- }
-
- @Override
- public void onTextChanged(CharSequence charSequence, int start, int count, int after) {
-
- }
-
- @Override
- public void afterTextChanged(Editable editable) {
- if (!ignoreNextChange) {
- ignoreNextChange = true;
- boolean spaceFound = false;
- for (int i = 0; i < editable.length(); i++) {
- if (editable.charAt(i) == ' ') {
- spaceFound=true;
- editable.delete(i, i + 1);
- i--;
- }
- }
-
- if (hadBlankSpace && !spaceFound && editable.length() > 0) {
- editable.delete(editable.length()-1, editable.length());
- }
-
- editable.append(' ');
- ignoreNextChange = false;
- }
-
- }
- });
-
-
mLoginButton.setOnClickListener(view -> login());
mForgotPassword.setOnClickListener(view -> forgotPassword());
@@ -208,7 +167,6 @@ public class LoginFragment extends Fragment {
}
public void handleLoginCompleted(boolean success) {
- Log.d("[LOGIN]", "handleLoginCompleted " + success);
getActivity().runOnUiThread(() -> {
mLoginButton.setEnabled(true);
cancelActivityIndicator();
diff --git a/android/app/src/main/res/drawable/ic_eye_noshow.xml b/android/app/src/main/res/drawable/ic_eye_noshow.xml
new file mode 100644
index 0000000000..1d5304afac
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_eye_noshow.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_eye_show.xml b/android/app/src/main/res/drawable/ic_eye_show.xml
new file mode 100644
index 0000000000..273ecc8339
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_eye_show.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/android/app/src/main/res/drawable/selector_show_password.xml b/android/app/src/main/res/drawable/selector_show_password.xml
new file mode 100644
index 0000000000..a44092aceb
--- /dev/null
+++ b/android/app/src/main/res/drawable/selector_show_password.xml
@@ -0,0 +1,5 @@
+
+
+