From e3909de258caa01870d83ae8f42d18e6509618fb Mon Sep 17 00:00:00 2001 From: Mike Digman Date: Fri, 30 Mar 2018 11:22:05 -0700 Subject: [PATCH] Fix right-most navbar icon tinting mismatch Rotate, a11y navbar buttons didn't match the color of the home, back and recents buttons. Change-Id: I7337b0a7091d7d42b0ae45cb0c29b96c5d5b126c Fixes: 77286278 Test: manual comparison of color in screenshots --- .../ic_sysbar_accessibility_button.png | Bin 232 -> 0 bytes .../ic_sysbar_accessibility_button_dark.png | Bin 234 -> 0 bytes .../ic_sysbar_accessibility_button.png | Bin 166 -> 0 bytes .../ic_sysbar_accessibility_button_dark.png | Bin 165 -> 0 bytes .../ic_sysbar_accessibility_button.png | Bin 282 -> 0 bytes .../ic_sysbar_accessibility_button_dark.png | Bin 283 -> 0 bytes .../ic_sysbar_accessibility_button.png | Bin 383 -> 0 bytes .../ic_sysbar_accessibility_button_dark.png | Bin 384 -> 0 bytes .../ic_sysbar_accessibility_button.png | Bin 498 -> 0 bytes .../ic_sysbar_accessibility_button_dark.png | Bin 504 -> 0 bytes .../ic_sysbar_accessibility_button.xml | 26 ++++++++++++++++++ .../statusbar/phone/NavigationBarView.java | 7 +++-- .../policy/TintedKeyButtonDrawable.java | 16 +++++++---- 13 files changed, 42 insertions(+), 7 deletions(-) delete mode 100644 packages/SystemUI/res/drawable-hdpi/ic_sysbar_accessibility_button.png delete mode 100644 packages/SystemUI/res/drawable-hdpi/ic_sysbar_accessibility_button_dark.png delete mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_accessibility_button.png delete mode 100644 packages/SystemUI/res/drawable-mdpi/ic_sysbar_accessibility_button_dark.png delete mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_sysbar_accessibility_button.png delete mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_sysbar_accessibility_button_dark.png delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_accessibility_button.png delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_accessibility_button_dark.png delete mode 100644 packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_accessibility_button.png delete mode 100644 packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_accessibility_button_dark.png create mode 100644 packages/SystemUI/res/drawable/ic_sysbar_accessibility_button.xml diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_accessibility_button.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_accessibility_button.png deleted file mode 100644 index 0615668b6465899aec62529b63678d2bfb6d98a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmVP)jv20w{L{qU{nx&#@!@?z?LT}Tt!Q6m^4lN=|grrFmQX-;7 zhlBxhhO9zy3bkn(HXa3H2JAB+rhtdNb8`G*;-ILps)oYB diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_accessibility_button_dark.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_accessibility_button_dark.png deleted file mode 100644 index 839e5edeead3853252612a213ca455fa8485a0e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpMo$;VkP61P6SguoJ4m?2m+-B) z(J+hk#zVFQj!Q0i48KmWlzh|?(0nGAYn}FhT0HE^0C;Paa8d_{kr}`SXn3$((h$p_6*cAE6{EPXQhiz}3 i{#x4h4+!n%2)^IJWViVI@&iD}GkCiCxvXN3TO6kO zq^Q+v?Zw$^j!ERayOk91iYKkxHtM!+TC-ne?Y)&-rq@s4IQN-dzl0%b=dWaCW5ZOS O#SEUVelF{r5}E)TIXn*l diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_accessibility_button_dark.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_accessibility_button_dark.png deleted file mode 100644 index 66e11fb52b3005a59f47dcd9133f80181a652fd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i98VX=kP60R355seKFDy~?F{1& z`6JIUKX_4Nk^0%B9Va$)ESzz$_uvG_nT}H$WjS0Mb(|M?7zR933Si}`IPhUULrudf z$61OK7S2s%KFr$2uW`zb!PSf*m8nsyfKi0kqoIg*u~b7s2(v6BgZkT|*9@~|_<;5@ Nc)I$ztaD0e0suPeG=Bg9 diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_accessibility_button.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_accessibility_button.png deleted file mode 100644 index d2fe0c32cad3c82e2da7dbb001506641f260aebd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dhn_BuAr*{oFKtaM3S?*qT+-C_ zsysK6p{+w-U^au5+Ja?EJG0&8BO7@it?%ML;3;{u^Zxp(x_eV2Uf4dJ9y;;Fs`&Gt ze;PBSpLd8T-9Ggo^Tge*?^!eKT+i=4VLv}zer<QOt(p{hxai++EoEIzP2I<<{};8L)mnM0bPZ#|DocZWfwSi9-`JVnn6uYO zg>QQtr5}4c%e>|M}iy{lJ4M0`(p9jWr2T=g@Ifk~i&fn~wXN-)F5 e_`{#pJcj(D!@Nd(lTv`5W$<+Mb6Mw<&;$Tb+H`vW diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_accessibility_button_dark.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_accessibility_button_dark.png deleted file mode 100644 index 5923269a882b6b483708067d1d121f26b3237151..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmV+$0p$LPP)EBJ&>uCb#3&O-solhruDw=hO_?veEaWQ@vI7c zGAUB3Wxvz002ovPDHLkV1oPogtq_y diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_accessibility_button.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_accessibility_button.png deleted file mode 100644 index d0196e5f8ea3b37a9b9cf4ab2a236178a6052597..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKN!06`b;uuoF`1Y!5iE^Td!^7#q z;+xN`cr-2a%p~*E0dAq+@=8v!ge*EeRkr>V&#ot@mlS26;#FsUR2z3ke!j-iJAC|G zeF~2V248s~nEsJra<`A1#cpf0@R^TfvOJc!%{e5}>C+i(p)^sM_tb|IUxL)@zB&Ig zjB9J3_4%UWHHAYQxqlvYMl>w{v#3{4X_97`#a1_SwxujPv@0LzF?t!kNShn1JxMZd z(har8Uxbb=n76;?scBu@hY8U?K0G>lTvzTBll}Uir{Z53a$G)bFV~#nW^1AIfkbd=5F~gm;a8S_C&^wv)D2xuthpIn|Q#H-US8TOGxO{q@Y(4+m(aE U_E$an4GdTYPgg&ebxsLQ0KLqln*aa+ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_accessibility_button_dark.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_accessibility_button_dark.png deleted file mode 100644 index d3a2b393e685f722d28474d28cbbd6ff3ad88ce8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKN!07Jj;uuoF`1Y!5NHwF3`^Vqs zZk@U>>YH5=b+GE-UDbzs_x4Qnyk+E<^7nzBYbY?Wd2ezg6g# z`S!0xR=C{Lwws46Yp$lZguqf;dSEg zf(|dY87UKE*ZpCN*?3xMa!-J#pnXS5U8B<61{ReC9I6V8oE{ELLK7NTzNo>ODnL<< c11g?Hj7MLxWwYd^fx?=>)78&qol`;+006zD-2eap diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_accessibility_button.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_accessibility_button.png deleted file mode 100644 index 726643ca1bb1d3fbbf3eefab7e6a72cb5aa8107e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z_`=X#WAFU@y#{nj`%_uh7ab^ z9}g*>iQZ#ybY>+-vegpq;(Zlic1JbOot8SBlOA7l_jc{H_RIHc=AV(@$CI=%LPzX0 z+v~5D`XW{9&;MF5W5(j(C;1coio2fw;_o@$tW??LH~A$8*L>c(nLZ&bTNj)U`Nj30 z@xAZU+K2WECQ}XS98N9|h&l4wm2=C*iU~(oA2IQNA+h~TsY>2(~w&$F{c13a=Wt!!|bP$Mc4;K6ojeZwEGeOw`y%dT@Lf66?=y|-^AS5Rte zt={g3#eVDm-sGMBcC*q6nbSF!R~)yU?`ov`>87o%RPJV-6K2J0x5e*GYnH1>cG={% z=i`9|X{;6r~4KbD=?VC1^!4DZ47cLSDb@Nn)x{6{q@Y_j;^YD%luiN4yiU26x=^FWcgGKbX-wDaO0M&$fD;D42MCo#f@*rEHPmdGma& zzFNI(Q&(&KpL0pre9o2Cm(@N`IlcM(+w&V483cG3HvHeeZ8k&3Wd2LiJNz9mK!R=K itOgi3pv?#c3>qaVT3?!vN-qP(D1)b~pUXO@geCwXu;GgU diff --git a/packages/SystemUI/res/drawable/ic_sysbar_accessibility_button.xml b/packages/SystemUI/res/drawable/ic_sysbar_accessibility_button.xml new file mode 100644 index 0000000000000..1603ebab1f279 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_sysbar_accessibility_button.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 84582b0278f23..f216695c24522 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -424,13 +424,16 @@ public class NavigationBarView extends FrameLayout implements PluginListener