From dcb687ccadfe93d2bfd01c175f754539d126be0a Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Fri, 9 Dec 2016 01:56:55 +0000 Subject: [PATCH] Merge "Update TextInputLayout icon for spec update" into nyc-support-25.1-dev GitOrigin-RevId=e7f67226a7ce97d1ae0d22b4a4b4e33010db4881 PiperOrigin-RevId: 141507754 --- .../color-v23/design_tint_password_toggle.xml | 3 +- lib/res/color/design_tint_password_toggle.xml | 3 +- .../design_ic_visibility.xml | 6 +- .../design_ic_visibility_off.xml | 28 ++++++ .../drawable-hdpi/design_ic_visibility.png | Bin 0 -> 470 bytes .../design_ic_visibility_off.png | Bin 0 -> 507 bytes .../drawable-mdpi/design_ic_visibility.png | Bin 0 -> 309 bytes .../design_ic_visibility_off.png | Bin 0 -> 351 bytes lib/res/drawable-v21/avd_hide_password.xml | 86 ++++++++++++++++++ lib/res/drawable-v21/avd_show_password.xml | 85 +++++++++++++++++ lib/res/drawable-v21/design_password_eye.xml | 39 ++++++++ .../drawable-xhdpi/design_ic_visibility.png | Bin 0 -> 593 bytes .../design_ic_visibility_off.png | Bin 0 -> 629 bytes .../drawable-xxhdpi/design_ic_visibility.png | Bin 0 -> 868 bytes .../design_ic_visibility_off.png | Bin 0 -> 884 bytes .../drawable-xxxhdpi/design_ic_visibility.png | Bin 0 -> 1155 bytes .../design_ic_visibility_off.png | Bin 0 -> 1201 bytes lib/res/drawable/design_password_eye.xml | 27 ++++++ lib/res/values/password_visibility.xml | 28 ++++++ lib/res/values/styles.xml | 2 +- 20 files changed, 300 insertions(+), 7 deletions(-) rename lib/res/{drawable => drawable-anydpi-v21}/design_ic_visibility.xml (74%) create mode 100644 lib/res/drawable-anydpi-v21/design_ic_visibility_off.xml create mode 100644 lib/res/drawable-hdpi/design_ic_visibility.png create mode 100644 lib/res/drawable-hdpi/design_ic_visibility_off.png create mode 100644 lib/res/drawable-mdpi/design_ic_visibility.png create mode 100644 lib/res/drawable-mdpi/design_ic_visibility_off.png create mode 100644 lib/res/drawable-v21/avd_hide_password.xml create mode 100644 lib/res/drawable-v21/avd_show_password.xml create mode 100644 lib/res/drawable-v21/design_password_eye.xml create mode 100644 lib/res/drawable-xhdpi/design_ic_visibility.png create mode 100644 lib/res/drawable-xhdpi/design_ic_visibility_off.png create mode 100644 lib/res/drawable-xxhdpi/design_ic_visibility.png create mode 100644 lib/res/drawable-xxhdpi/design_ic_visibility_off.png create mode 100644 lib/res/drawable-xxxhdpi/design_ic_visibility.png create mode 100644 lib/res/drawable-xxxhdpi/design_ic_visibility_off.png create mode 100644 lib/res/drawable/design_password_eye.xml create mode 100644 lib/res/values/password_visibility.xml diff --git a/lib/res/color-v23/design_tint_password_toggle.xml b/lib/res/color-v23/design_tint_password_toggle.xml index 3a09d32a1..b728ccff4 100644 --- a/lib/res/color-v23/design_tint_password_toggle.xml +++ b/lib/res/color-v23/design_tint_password_toggle.xml @@ -15,6 +15,5 @@ limitations under the License. --> - - + \ No newline at end of file diff --git a/lib/res/color/design_tint_password_toggle.xml b/lib/res/color/design_tint_password_toggle.xml index 15016e4ac..13beffd91 100644 --- a/lib/res/color/design_tint_password_toggle.xml +++ b/lib/res/color/design_tint_password_toggle.xml @@ -16,6 +16,5 @@ --> - - + \ No newline at end of file diff --git a/lib/res/drawable/design_ic_visibility.xml b/lib/res/drawable-anydpi-v21/design_ic_visibility.xml similarity index 74% rename from lib/res/drawable/design_ic_visibility.xml rename to lib/res/drawable-anydpi-v21/design_ic_visibility.xml index 91d46ffd9..123acd20e 100644 --- a/lib/res/drawable/design_ic_visibility.xml +++ b/lib/res/drawable-anydpi-v21/design_ic_visibility.xml @@ -20,7 +20,9 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0"> + + android:fillColor="@android:color/white" + android:pathData="@string/path_password_eye"/> + \ No newline at end of file diff --git a/lib/res/drawable-anydpi-v21/design_ic_visibility_off.xml b/lib/res/drawable-anydpi-v21/design_ic_visibility_off.xml new file mode 100644 index 000000000..a8b47f067 --- /dev/null +++ b/lib/res/drawable-anydpi-v21/design_ic_visibility_off.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/lib/res/drawable-hdpi/design_ic_visibility.png b/lib/res/drawable-hdpi/design_ic_visibility.png new file mode 100644 index 0000000000000000000000000000000000000000..329e617e9c7e4036e3a16f19beea3b37531cb538 GIT binary patch literal 470 zcmV;{0V)28P)9Rm6Jm=-`T+Ve0Iitsry1F4fPDI(brtey9^UbnxU5-tk zr+#S_%%LZG9Z9E${%9RBzdg|T|GT^iM}BHrFl)(vaMoQ?z@V?W=$?iQKxV>j&fhjb z%C!*ts9&UNBbV86MWF0cxJ^HxX3C5@px0h5x1}V<%g{grRIL0{)>Ob`NIuubXi{+o zR&wep$dcM`0d)8ftR|>wg{gt%puPjRn;cjGQ;9we<`Vr*(V|%}Q?O`0(MN#}?}M=f z>dAp&&MM}>5z;rc@gkTLpklRcO*d$S}T>(|=N$tz#%xfkUzjlFQI^9qH zj_Dk_=bR&{dhDQZ$$>{MIyNO^7DH!WEE-dCBD&o$V#J`bQ^y&90R)t%5-bJZl>h($ M07*qoM6N<$f(1_1<^TWy literal 0 HcmV?d00001 diff --git a/lib/res/drawable-hdpi/design_ic_visibility_off.png b/lib/res/drawable-hdpi/design_ic_visibility_off.png new file mode 100644 index 0000000000000000000000000000000000000000..b21a6862977bfb79d5621df754b90e2915fdf3ee GIT binary patch literal 507 zcmVAi)KVUe zz$xNZs6{~u5yS}^F1(MNM7mpj-_7UYBju9)HRgwW>+{Vm`~0y=Ar;@IDZ41H-_L{^RWs|lX>&FL z_S9Yl9aXEZ#j{f~VJ)HF=z&;|^<-^Hq^Md>cHTKC)NZvtj#P`wh5%jR->qnsbT1&E z5^BVEPn5xA*t`P(XTxwqRVGpkpd_CC6hMd&*sFng~7-;fB{4^MnixfO8`ZR{cW0$~!NYP|1Y@Y;xyJ0v1${vdp z=ab*yZArVmPM|eaz%f@{ktNhn4=|?DsiP zs}3os>RCLyc{64_@}>T_OebhooMuxt4oRAdjLA!j=$GOA!1wD58Z(%>yB7{_)W_5fllEprBcZw1WnQAhZ=d4l}Sb zdUys07vOb`?)!e;*Hu#Jd+mMYD}4nzW%|BR1L9+G{ZQp&j7wfwL;U}!QM=PpRs)rbnK#@%Djz!t1Z#BiD_-5T{%v_ z|MEZvgh$wK1Ej+00000NkvXX Hu0mjfuP=*W literal 0 HcmV?d00001 diff --git a/lib/res/drawable-mdpi/design_ic_visibility_off.png b/lib/res/drawable-mdpi/design_ic_visibility_off.png new file mode 100644 index 0000000000000000000000000000000000000000..3efdf49225d2972404b12050e99673e85e1edf91 GIT binary patch literal 351 zcmV-l0igbgP)hSqc>diP4$sW^U%BO-%KmsS`H+(X*WB~K#9deQbW&MH@=6l3F>|bg zT9cE)snpumquooFttH7vm7Wu&Lw)mzRxS!S@2ez5A{d8X3(uR-KXX!eZmPstJbNK? zTZ#=ek-YT;11WX`_#%{2Wh-g^Bs0`fYz3@^a)=*NPR`+IHy8?~kEc>3?N_=k^E%WV zrKycyIqAjEeJMB+-(d`>G_B;b3c)3xA~`cqtKAV-JamCJ2Oir>9b2mC=GZeENz8ZO x{+>`cF>>F;$Q6a!GLrqs$pZFI7H;}S{050TyiMlgk#hh5002ovPDHLkV1g{Sls*6e literal 0 HcmV?d00001 diff --git a/lib/res/drawable-v21/avd_hide_password.xml b/lib/res/drawable-v21/avd_hide_password.xml new file mode 100644 index 000000000..8c6ed1cd8 --- /dev/null +++ b/lib/res/drawable-v21/avd_hide_password.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/res/drawable-v21/avd_show_password.xml b/lib/res/drawable-v21/avd_show_password.xml new file mode 100644 index 000000000..5b205d796 --- /dev/null +++ b/lib/res/drawable-v21/avd_show_password.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/res/drawable-v21/design_password_eye.xml b/lib/res/drawable-v21/design_password_eye.xml new file mode 100644 index 000000000..1bffaf458 --- /dev/null +++ b/lib/res/drawable-v21/design_password_eye.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/res/drawable-xhdpi/design_ic_visibility.png b/lib/res/drawable-xhdpi/design_ic_visibility.png new file mode 100644 index 0000000000000000000000000000000000000000..1f7b4cc8f24b2f7632cd7568f236c7d765d8e352 GIT binary patch literal 593 zcmV-X0<#`8vnng>!UtbleXE=B(Ruq2mABs<^Oc z-JECL(G$w{-ALkc<6H0O)0U@vs3K{iu6&?hOLE@!r=*3tv>>NR1z$9G5~oCe+qhc*Fur@<-d25g7f*QIUVExQNQ<_{5HDuo+q`X*Me^{J{{}6Ht%tF^o&_+cAdNO-)&tv_k}ex fp4QRPaUVPY1vc-$n*zk(00000NkvXXu0mjfH$oNV literal 0 HcmV?d00001 diff --git a/lib/res/drawable-xhdpi/design_ic_visibility_off.png b/lib/res/drawable-xhdpi/design_ic_visibility_off.png new file mode 100644 index 0000000000000000000000000000000000000000..46bf0c931a0ae05a32733eb4b9fe1e9895d42c83 GIT binary patch literal 629 zcmV-*0*d{KP)^q&wHDGIu(&_c13b1fcJ zMe!n%3}Q(Umo!;|N$`?O^zQ3+gU^@ep20^P^8T#Hz2L{g^LzZO9d*=m`g(Q#{R3gW zKB6x~okY*0oX~N_hraTwKTP~-$C@wQaM?4ehxwHF*hJ(r@vV2vsZQ7^5Xb!}O1JGj zZ52C{63b%7wp`VyN<1ndCMC!{9Tj@XrYI0?A6U@U&~(azn??z->6{t8ZeNH3QLO7u zLJVD0(rXTcs7P?lxbXXt3*?Ao}Vdy%dQ7|EX~pefS*VA>m{N5rzoi0Vhwup*Kz z0IrJ?;<8A#>M_%JMI^fkXjv^GJ`%~!`$wON!bZA)u9ciXJGn1DRcOw`g!mjl%aVaT zdv<3MYo3(!qMd}emVX}P7i-ze4lX3u$T%V9ONf2vm2@$EW#4hKKy0SO(5q&2&PGBU zxMk64EltmR%NPC<1>$LERjA{hsIr8pSi@CY^%Atb>-TyIp76GBOhi6o_bpkkPUM~N zruW_Tz_vqUyB@mhhD%P6TuHTmnb*?%e@XPIi`Wo;@vPc9qp#zr|5<+n{d4iW28vN3 P00000NkvXXu0mjf>5ejo literal 0 HcmV?d00001 diff --git a/lib/res/drawable-xxhdpi/design_ic_visibility.png b/lib/res/drawable-xxhdpi/design_ic_visibility.png new file mode 100644 index 0000000000000000000000000000000000000000..c816ab49dca80cea33cd7815db4549dfa8978579 GIT binary patch literal 868 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 literal 0 HcmV?d00001 diff --git a/lib/res/drawable-xxxhdpi/design_ic_visibility_off.png b/lib/res/drawable-xxxhdpi/design_ic_visibility_off.png new file mode 100644 index 0000000000000000000000000000000000000000..ce3c9d84dc6f5b09ca66e97d57c8957cc9448af4 GIT binary patch literal 1201 zcmV;i1Wx;jP)V#V;A(avu8A8vpfcdyoKp%nxobaIfQ#iua=n>-!1PMNYO^9-z5kqYU zf}|zkPA)J^2aS|5y@QBy+fcfT1d_Idd$@=oB-l?Wrea1A)h1bn!ga(EB!C2AjCGhc zBgzdhms#yal>39-t`meUB(oUS|A3gqazwpXfcIS|*sLYlONeqd)y!ZH#}V~z0#6B} zl;Bi~t^cY`7AZZ4sMibNF`OH?oU&XWf*Bq|T&)nNVPD@==OM2442C%jA?R0$QwQQB zVF`kMzhQytc^|J)XheJ@tnvREgNVk1M#4wJo34KTd8Du&QLl?+`w`Cx#}M@z zNGXecM7abv;#A6*$Ak(*y?(No!7>tva*ZTghj>c3Ree5TQ=`0QRV+>p$+lp7`>Rcv z(8{c?Wx&_J#ume3#eglu*&9_|FV znXkj10C&?9_JkNK`8M1M0881&7~*sP(3!ae$ma>#J^pHs^CeGGpg)`sP96`ii(chl za#Qs34lBubf4>m49F|f?6Kx#k1ZVk+32eq0;UqtBh&QOCnmoYtLFN + + + + + + + + + \ No newline at end of file diff --git a/lib/res/values/password_visibility.xml b/lib/res/values/password_visibility.xml new file mode 100644 index 000000000..23faec373 --- /dev/null +++ b/lib/res/values/password_visibility.xml @@ -0,0 +1,28 @@ + + + + + + + M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z + M2,4.27 L19.73,22 L22.27,19.46 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z + M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z + M3.27,4.27 L19.74,20.74 + 200 + 320 + + diff --git a/lib/res/values/styles.xml b/lib/res/values/styles.xml index 820742fa7..1e13d477f 100644 --- a/lib/res/values/styles.xml +++ b/lib/res/values/styles.xml @@ -69,7 +69,7 @@ @style/TextAppearance.Design.Error @style/TextAppearance.Design.Counter @style/TextAppearance.Design.Counter.Overflow - @drawable/design_ic_visibility + @drawable/design_password_eye @color/design_tint_password_toggle