From 349a9bd76064546e6c8ada0c9903499e42547fe4 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 1 Jul 2014 16:12:35 -0700 Subject: [PATCH] Use shape drawable for button asset, enable shadows BUG: 15316437 Change-Id: I8c2ddce50fcf8082c8ba01350606d6f344e03306 --- .../anim/button_state_list_anim_material.xml | 25 +++++++++++++-- .../res/drawable-hdpi/btn_mtrl_alpha.9.png | Bin 189 -> 0 bytes .../drawable-hdpi/btn_toggle_mtrl_alpha.9.png | Bin 225 -> 0 bytes .../res/drawable-ldpi/btn_mtrl_alpha.9.png | Bin 143 -> 0 bytes .../res/drawable-mdpi/btn_mtrl_alpha.9.png | Bin 154 -> 0 bytes .../drawable-mdpi/btn_toggle_mtrl_alpha.9.png | Bin 197 -> 0 bytes .../res/drawable-xhdpi/btn_mtrl_alpha.9.png | Bin 234 -> 0 bytes .../btn_toggle_mtrl_alpha.9.png | Bin 248 -> 0 bytes .../res/drawable-xxhdpi/btn_mtrl_alpha.9.png | Bin 418 -> 0 bytes .../btn_toggle_mtrl_alpha.9.png | Bin 325 -> 0 bytes .../res/drawable-xxxhdpi/btn_mtrl_alpha.9.png | Bin 1507 -> 0 bytes .../btn_toggle_mtrl_alpha.9.png | Bin 1228 -> 0 bytes .../res/drawable/btn_borderless_material.xml | 15 ++++++--- .../res/res/drawable/btn_default_material.xml | 16 +++++----- .../res/drawable/btn_default_mtrl_shape.xml | 26 ++++++++++++++++ core/res/res/drawable/btn_toggle_material.xml | 20 ++++++++---- core/res/res/values/arrays.xml | 2 -- core/res/res/values/dimens_material.xml | 12 ++++++-- core/res/res/values/integers.xml | 1 + core/res/res/values/styles_material.xml | 29 ++++++++---------- 20 files changed, 106 insertions(+), 40 deletions(-) delete mode 100644 core/res/res/drawable-hdpi/btn_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-hdpi/btn_toggle_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-ldpi/btn_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-mdpi/btn_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-mdpi/btn_toggle_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-xhdpi/btn_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-xhdpi/btn_toggle_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-xxhdpi/btn_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-xxhdpi/btn_toggle_mtrl_alpha.9.png delete mode 100644 core/res/res/drawable-xxxhdpi/btn_mtrl_alpha.9.png delete mode 100755 core/res/res/drawable-xxxhdpi/btn_toggle_mtrl_alpha.9.png create mode 100644 core/res/res/drawable/btn_default_mtrl_shape.xml diff --git a/core/res/res/anim/button_state_list_anim_material.xml b/core/res/res/anim/button_state_list_anim_material.xml index 01989a4edaf16..9a615488777e3 100644 --- a/core/res/res/anim/button_state_list_anim_material.xml +++ b/core/res/res/anim/button_state_list_anim_material.xml @@ -18,16 +18,37 @@ + - + + + + + + + + diff --git a/core/res/res/drawable-hdpi/btn_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/btn_mtrl_alpha.9.png deleted file mode 100644 index 171688f8e26e6cf0f1888c24eeb786436bf11cb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^nm}yC!3HD`7Jga>q*^>(978H@y}fD3bwGiqHPJo) zeIWDR1FM&^T2JA-)wb*(Ka=0XVgVJ;mp5O8e0CAk;}J@+Sh6H$^%bMNlb^nr|2u!9 z`3Db4$63Oc+$Q8Pa&D@Pa%f`V6jJe+z^ggISh3PV!4b%x^zcCa1Vy)c#kLjq<=r>e nGH@DM6bP0l+XkK?#e`# diff --git a/core/res/res/drawable-hdpi/btn_toggle_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/btn_toggle_mtrl_alpha.9.png deleted file mode 100644 index 879d9c29bb4689e5f050ab5747c319397f5f8283..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VORolO^$tZ^A?7 z=xGKDx3wG;{~0r$=w>%ymj1e@fmPx&a}vXYy9z#*-6}GztCwir3t02tKU(KyX0_KL z|K=CoIky$_)}7j%%s~Gk$$6s9jfIoTd R2B32oJYD@<);T3K0RT1a3Y zH2ll+_y7O@ObY*g&$nO*+TI}H{Qr+S?;q7SHAW1!Jb&%8UI-X{`9Hz1#N-?M{)Idx s+P_xBd-NaZ;y>bWY>A25hL@}i&X2Ag@jPE23ABO1)78&qol`;+0Op}JI{*Lx diff --git a/core/res/res/drawable-mdpi/btn_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/btn_mtrl_alpha.9.png deleted file mode 100644 index fc51595d40e89f0e9447afd11d89183f9e86f7ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3HFKYIk}9sYFi~$B>F!$q5Slf7%}%x#}$k{Hck*ao$x^MW888fiHTzWd7c)I$ztaD0e F0s!^YJ~{vZ diff --git a/core/res/res/drawable-mdpi/btn_toggle_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/btn_toggle_mtrl_alpha.9.png deleted file mode 100644 index dca86eae0d3384e959e096c199742ddab52fc2bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8wRq zxI00Z(fs7;wLrmiPZ!4!jfqDmIPx_p@UZM|N&obpSv~GRML>@NmztaT%cXC(+?7g@ zz339F!z0jeWYw8S)#(iz_?aK^UO9B}%mub*Z@Ip{%hQ>mveUVUCDe9bdL3KY;&s}8 nna|lgz1w@gNzUNqOkW3Xo|9!V%B*ie4rcIl^>bP0l+XkKr6EAf diff --git a/core/res/res/drawable-xhdpi/btn_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/btn_mtrl_alpha.9.png deleted file mode 100644 index 30d732a30b198ca1b0f3e3007aa22d3335cc0014..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^W_)l&Uq;HT%BY!V=F1vh0|#nsfCLmw zO2{)g_>OIMSwrfriHkGak35rkZJfx(1_WkCYwT-Q&)NH_uIKmC`|3}3I3L>TZJ+>j OJcFmJpUXO@geCw6He8+n diff --git a/core/res/res/drawable-xhdpi/btn_toggle_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/btn_toggle_mtrl_alpha.9.png deleted file mode 100644 index b135338b31e40072d6bd87e7aa8f778bf68fa9d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%EX7WqAsj$Z!;#Vf4nJ zaCd?*qxs3xYk`8ZJY5_^JUZV_^X6hQ6kxqCedkQ9O8fj)^-J0=Gg_ajO>{gO_FUP6 zi>c9Xm&ZLNLxtO13M=;KFs#_D>u^BMf?=k+NKbXq%c-XvR~%!JIlbugvf_G7x=)of%%L~EE)|Aj7%a9 zK$1)0055|Xn>Elu4NMhk4vSshK!kxLD_9WX){2*+4q!!6d=)b;JTed}uvdIgr}7}r z>A>V`DJ(D2lieHSqCZ(4DE(X!X*lt+#FMGX6Sk&(o-y~Sn-s`wh%q~kzIr|LU4Q6m1Cb~ zrh6m8>yh*o_L;V84p&c{ATc3Vbz;nXDTWoBbq_Q&@F%e5G{}C}th~FqH&Q!6Dm!;} zwxR+1wf}!kT-dkx;dhq?$q%C3bq$X@9FNcNG&!Sk@#sc9m0B+=k5`+&AL*7c=D)aM z!V>QrLC@d5cIVl3)%|c#*IdT3Now!2etm+I{j)&y+Z$@ zm$KPGt*N0AVPN8NV)DKUn>DC{n-gu%*UHF=JP>Bk+A@9jyo$*{FEe<$`njxgN@xNA Do=Ade diff --git a/core/res/res/drawable-xxxhdpi/btn_mtrl_alpha.9.png b/core/res/res/drawable-xxxhdpi/btn_mtrl_alpha.9.png deleted file mode 100644 index 01eeefef38bb856c3dec2953f63e9cd1384fb785..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1507 zcmbVMeM}o=7{8W^h}pt~Av1wpiZF?`z3cZKbkL9M+CllOf(Xjd9<+hpmFuw<5)2TL zjAff)e~e9?=x~c0DsGc(a|1HmaLY31NQf{TV-O~Z0TedHfchR#^bfK>yxhI-^FHtM zd!FC(yw7`kvom*X3V$ISf}l-Sizye(+2AV;3kBoAar?7i+QtzDTpm-#`AL?7^iHOf zf~_91oXVw0XHC_0Dg}Z-S76J)9gIgx@;1_d#|zL9l#&|ol8y?BgG;G$H?0%T ze$y+4-ATy1ks6p<&)5S;|y%Ix%3nnu5n`v#mR(eQSjRC6fh6uMCwUGLMJPYsK2fCB z*wET%ukli{T*}8(vkq_`W${5UsNItT@rHm6p2fPsp^%j(#!>B|XwGWViNTK4>2~4@ zL{7++3Im~)%hg&G1(V)LX!Qi5QeX(84Eopzi)l4RtxB!MjAl8C5(-R%C^1Y)sErB~ zLk)%?)=K+0l6FwRxNZ=44Xb$~7B{jK$uX>*VJd?iknLhP#^++ZurW^!zhomFZkksl z@dvb;uZd#adnl)wWjydog>m-=49sSY8AUZpL?cJ|%=JpM#$ZsQYK=x=FdJ3kHLUah zR80oR$oTg7PrC$Fpa*$zz4^gn{rXTexHBxc9Brj1;vh)4#cI;q10%nT+IEMaG1q=I z?YdfVzO(U|zR121^9a9~({*1Zdj7$-s8chh+4lA(bt}yxanc-#8Ev~p$8hhdK)!wP}>8XRi zM=kFCF+4p`Tr1JJ7C*UsC~kN2XNTvG2va^JeA8L9>y z5lFmr_{|%2CHdo_Cz6X>zmlANr}qkB%3C6w{buR-nfgNi;859!Wu6iWBKo4Q3BD5v z!{B;R8YB?C2LTCs4oDGcLLdn(kf`ga`puz<5n%g8s7!bcK^h=nFIZKqA-4*D8#_6c zRDXI)#QE0xzUAa@h!#YK6*Zkk0yU2tj7`zANrJbcggu{%F6D#;k}t=ZV*6s2HC}dM z@W8^opYgxwEZkDP^i$eMzOrt4?$`rOW5SNx&GBiruNlWuWSmvjF%f-bfB$4`{_v~z zBYnev#Ot$ePDb=grVEWf?Ckh*ys_%h!!!GJsa}13%M5)SD$bdY%y>KD5Yck*DAU0w w1U&;10?d)RmR7&6dhEjs@9JiYni)YTwBr`j9kqG#HU772B{EH47)l!d0ZT*@&j0`b diff --git a/core/res/res/drawable-xxxhdpi/btn_toggle_mtrl_alpha.9.png b/core/res/res/drawable-xxxhdpi/btn_toggle_mtrl_alpha.9.png deleted file mode 100755 index 7556167452fe3e3c72ca954c3da5efa7e1f38df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1228 zcmbVMZ)n_P7?0>mDU@BMtZ3&oO+^%!|H<7YH0$n?+S<#y6CSv5`GYr{2pvn1`M z-M8tA8@gGf_JcCfxeY-F`@?kl!O{)c@XHwcR0e*S=s;mG=r&N$H+Q|x4`m+=`0Lxl%9N-1V zm;fbUShEMNgMJKqx@wn4!_nevvI!l^h-IkA@emrr`UfJ*&R5?usqE&G$)ZPD+_6vP2uYwfvovfMJ{Ri zbz6v2h{-VYWSXwkYE+G%NVOVoYh!oOXa47Bq!GHtGS6^2C-6Bv!*Qt$%Oa9h^-NZ0 zL|$STp{Zjtte~dV9Fu1>N#t2p=W|**mzQ)lCFw#+O{JUIf*XW}Yl5a-8`*7O_52gD zvg!jPgnk*qsb&WZPr?uelhDIe6@R&Cn6?}9uf+9fgsTDHo&i?ghYns(uxxMQKuSnw z1Vb`OUIZ2?h%7^9GAV{kS4^P-#I(f60W|Q||4AH;9HQe6`A^3*k5C)N+l~H5%*F%( z7mbaN=A-?1_Zph5hXpNLj#mF%&9<#Di7hwY-?LopynX9%Ezz}>+yYN_ca2?rr}c}G zj?b_5e86;mbK|?a%RP^}yAF(TrQBlT(9dMY^?lDMgYMRo^k+-gwp}K^eYAi7kxv#r zdh3rfN$RUJ_wVE{ZCksRv{$@WAI$7JJ=gbA+iwef=lv^ZGkUi*|MkMbgBNF765oGp z-x|BKc&u{l(+|&Gc%%LNGW_-LoeQh@%Bd4oW#8h3Hy7tS=X(#&M^_TRtnCs;-c96M zdw;?&FA*nNd+W^la - - - + + + + + diff --git a/core/res/res/drawable/btn_default_material.xml b/core/res/res/drawable/btn_default_material.xml index 9cee3ab4cec35..b04d4fb2f75b6 100644 --- a/core/res/res/drawable/btn_default_material.xml +++ b/core/res/res/drawable/btn_default_material.xml @@ -14,10 +14,12 @@ limitations under the License. --> - - - - - + + + + + diff --git a/core/res/res/drawable/btn_default_mtrl_shape.xml b/core/res/res/drawable/btn_default_mtrl_shape.xml new file mode 100644 index 0000000000000..9235c76860857 --- /dev/null +++ b/core/res/res/drawable/btn_default_mtrl_shape.xml @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/core/res/res/drawable/btn_toggle_material.xml b/core/res/res/drawable/btn_toggle_material.xml index 73fe4d3e1a1a3..a9951e7188b19 100644 --- a/core/res/res/drawable/btn_toggle_material.xml +++ b/core/res/res/drawable/btn_toggle_material.xml @@ -15,16 +15,24 @@ --> + android:insetLeft="@dimen/control_inset_material" + android:insetTop="@dimen/control_inset_material" + android:insetBottom="@dimen/control_inset_material" + android:insetRight="@dimen/control_inset_material"> - + + + + + diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index b135d4e791094..11d6dca032b71 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -335,7 +335,6 @@ @drawable/btn_check_to_on_mtrl_013 @drawable/btn_check_to_on_mtrl_014 @drawable/btn_check_to_on_mtrl_015 - @drawable/btn_mtrl_alpha @drawable/btn_radio_to_off_mtrl_000 @drawable/btn_radio_to_off_mtrl_001 @drawable/btn_radio_to_off_mtrl_002 @@ -402,7 +401,6 @@ @drawable/btn_switch_to_on_mtrl_013 @drawable/btn_switch_to_on_mtrl_014 @drawable/btn_toggle_indicator_mtrl_alpha - @drawable/btn_toggle_mtrl_alpha @drawable/expander_close_mtrl_alpha @drawable/expander_open_mtrl_alpha @drawable/fastscroll_thumb_mtrl_alpha diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml index 18e4574d31353..bae8e8d623855 100644 --- a/core/res/res/values/dimens_material.xml +++ b/core/res/res/values/dimens_material.xml @@ -58,6 +58,14 @@ 16dp 32dp - - 2dp + + 1dp + + 2dp + + 4dp + + 4dp + + 2dp diff --git a/core/res/res/values/integers.xml b/core/res/res/values/integers.xml index e6748c4d5652b..fd61f73396994 100644 --- a/core/res/res/values/integers.xml +++ b/core/res/res/values/integers.xml @@ -20,4 +20,5 @@ 75 0 100 + 100 diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 75f905c07efd8..b496ead7b46f0 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -355,35 +355,35 @@ please see styles_device_defaults.xml. @@ -399,9 +399,7 @@ please see styles_device_defaults.xml. ?attr/textColorPrimary 48dip 88dip - - - + @anim/button_state_list_anim_material @@ -430,7 +428,6 @@ please see styles_device_defaults.xml. @drawable/btn_toggle_material @string/capital_on @string/capital_off - 48dip