From 46923a963c480113b797856bfaf179dad5044d2d Mon Sep 17 00:00:00 2001
From: Amanda Riu <amanda.riu@automattic.com>
Date: Wed, 10 Jun 2020 16:04:01 -0600
Subject: [PATCH] Squashed 'libs/login/' changes from cfc0675d21..a3a1c83492

a3a1c83492 Merge pull request #37 from wordpress-mobile/merge/woocommerce-android/dark-mode
990df9483d Merge pull request #40 from wordpress-mobile/fix/9905_Crash_InflateException_Binary_XML_file_line_NEW
dfd3ed8246 Fix password drawable
bf3e2f3228 Merge pull request #38 from wordpress-mobile/fix/11307-The-wrong-icon-is-used-when-a-Password-is-visible
1428361e69 Merge pull request #39 from wordpress-mobile/merge/WordPress-Android/11934-take2
b77a144e99 using getViewLifecycleOwner() for observers
e2f7c1cdee Replace wrong icon with the right one

git-subtree-dir: libs/login
git-subtree-split: a3a1c834921064c31840003aaa91e4bf8f4f91fc
---
 .../android/login/LoginSiteAddressFragment.java |   4 ++--
 .../android/login/widgets/WPLoginInputRow.java  |   4 ++--
 .../drawable-xhdpi/ic_password_visibility.png   | Bin 970 -> 593 bytes
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
index a1b472472415..e6b653cb69d2 100644
--- a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
+++ b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
@@ -141,12 +141,12 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         mLoginSiteAddressValidator = new LoginSiteAddressValidator();
 
-        mLoginSiteAddressValidator.getIsValid().observe(this, new Observer<Boolean>() {
+        mLoginSiteAddressValidator.getIsValid().observe(getViewLifecycleOwner(), new Observer<Boolean>() {
             @Override public void onChanged(Boolean enabled) {
                 getPrimaryButton().setEnabled(enabled);
             }
         });
-        mLoginSiteAddressValidator.getErrorMessageResId().observe(this, new Observer<Integer>() {
+        mLoginSiteAddressValidator.getErrorMessageResId().observe(getViewLifecycleOwner(), new Observer<Integer>() {
             @Override public void onChanged(Integer resId) {
                 if (resId != null) {
                     showError(resId);
diff --git a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPLoginInputRow.java b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPLoginInputRow.java
index c17d99bb5280..42f02d849428 100644
--- a/WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPLoginInputRow.java
+++ b/WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPLoginInputRow.java
@@ -79,8 +79,8 @@ private void init(Context context, AttributeSet attrs) {
                     mEditText.setHintTextColor(getResources().getColor(android.R.color.transparent));
                 }
                 if (a.hasValue(R.styleable.wpLoginInputRow_passwordToggleEnabled)) {
-                    mTextInputLayout.setPasswordVisibilityToggleEnabled(
-                            a.getBoolean(R.styleable.wpLoginInputRow_passwordToggleEnabled, false));
+                    mTextInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+                    mTextInputLayout.setEndIconDrawable(R.drawable.selector_password_visibility);
                 }
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
diff --git a/WordPressLoginFlow/src/main/res/drawable-xhdpi/ic_password_visibility.png b/WordPressLoginFlow/src/main/res/drawable-xhdpi/ic_password_visibility.png
index 62f5d6a3433050d098a93cc61bfc3526de0b03a5..1f7b4cc8f24b2f7632cd7568f236c7d765d8e352 100644
GIT binary patch
delta 579
zcmV-J0=)go2hjwO8Gi%-008|9F$@3z0vJg|K~#7F?bb_6e03NH@XrJ~LR!*AWX1;F
zMzslwc1a3CJMn_+K&`<P-$FzLf^Q%qQH+FMKw@o*3@?S^MyzcYD08T$u^7+a)xiJo
zaF`k4kBj*{%jfwz$KQo>baZsw4+G|`+jF7f|J$m#uxH(zXMf$%6Uz48NaAwiTkq)8
zmZyBEB59(oe4t-Ta^Ci*q=mY)Ag4(MUrE}iFAZwKYkmvDH5(?Cbm>wuX;Uqj`qitl
zdDFi^@KXh8MLWS{)r1TauG0~9i(-`3ga36*%uD_Xo@r5*a*(KaAwKgzg^L5wW7V;m
znj<Un0O3MiM1OZ<Gu+w&;5laxbxsulL#~75$5O^6L2UqfoTYnCbOW}+?5GAFa~cj!
z0#?KBGGHp~{vfAeRuWbTa2$3I0mE_Hw1)5E5nX^<*sTKcaoYYP{DGP5C2|yY4*(-^
z+LVTzlgv$C3A;;x>9G5~oCe+qhc*Fur@<-d25g7f*MFsa5?-_-py(v^=L>*Rc+ozR
zrq7ST;Aa5xmL009I<TZ0z~@2gT(7{3;VZH%%e&z#^m#F3!GWwRi?OU89NtkGCj1jT
z(~co&rEqcnHZGf2{1ODOZJ9DGFK@)O?Qm;<_Od1n+LN?Vy9P8VXWk!@7V39zX;HuT
zoBTGq^gNy?wWZgBZ!$g|>%KPcad-5LS!;HkyYk;{T{-uKH8Y;p(a~`qJOBkY@4uS@
R#NYq`002ovPDHLkV1ilQ7bgG!

delta 959
zcmV;w13>)I1j+}H8Gi-<00374`G)`i02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l
zVPtu6$z?nM00V4EL_t(|+T>b|v70aqPP#zZpmc)A2yBpS@YtYqf|3bnCrB~@$poYm
zkW4^20oj0xt4Up*B+KBupR4b5TmrIX=|g{Jv3TcW8ET@w?|)Oc4D<vP0VU=-j2qC|
zTrWVU<#Ks?_1%Ne8Bo<v9|Ldp;ubKAegle`M>y@K%>P%Q4OnIOXpN^pEvHGKSTRQ|
zSgtite2DNRTC4*qG(tNzQ<%BzQHB&e0&4IA!~cQTzzS++uR#dkJ<P;^A=(Am1R;DA
zQtQIHNsvvvl7H|e<8GTd6TOu1g(GH^J~*^7|8U{Wx~(GcrOrS$Ok@S9jR{Ja@e|N~
zOb38xZBhq&jOjy61iX*H`xUL*EB1K>zR#}IK%E9ye6?>5L9E>=Su@rGNc&vK-y6-I
zK^xaGAQ>wS*DqEQhsSrIUnZG5qqVni$tGJtsr_z-Cx7Xs#LYxyY1Gs_AFMf6iexM@
zc$darxVK`n%0JfJDCb>KLCa3e5<wH&nI0vY$eY>;Ahv+*WqulbUYRx43Y`8B?z#9k
z!uxkb1=M{5whKHsprC=#VG4{4ly=4iQxH3mwFPAw$4jMwQ9T1jTl@ms@xpfFqXi=T
z@|qo=XMezGKLbV=^!rFSn23Xr2FsD6mYobELUGhw31xwhSiVV)z$3@H2TZI)90xcd
zc2k5HT(KjnOE5~6P`q#8COmVTD8#cvvyug$6eze+9;0To*|`!rAs{ur-pE?761-b2
zx>1k(CSuCMv7ShLawGISb)R&j7u){_aET*)4u2-9pFLpo%)tlAcHye9%ri%+glALp
zJJ(v!;;kGRb1IsKU{(oXL7-Je^^AFrf)5XM)ar{p^Yx5)UrJ$quCmJo%fzCRk$DQw
z{H7uxka!eK5t@JN=vrhh*Vi%LMHGU952`shcbub|WG(Qv+M>Q>gkWLB!AHn4?cP(y
zm4B_sjb}d9RO%r_#lgqoT`Owdt<a}xXE(MSLO2&uG_ckJ>~xJ~S8LJH!zpHTEjppO
z?004$HFq6C#ER~-Sm{xn@u2N>L5OC8a_o@=ZR<-19E=dTa^9Rf9}9NCp*UhHeBtA8
z$6fFvCXbiT8>f!*<#305go|y3IFKlhkT`M%g5Jlh|JOk`lX|?rPYpPDE&l!3!#<gL
hn;(0;h4EW}0RVu#HSV+iNpS!G002ovPDHLkV1g9LzghqQ