From 6d0576d3e82420cfc1840542bb897e5686d548e4 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Mon, 24 Jan 2011 19:37:59 -0800 Subject: [PATCH] Fix bug 3385930 - Holo.SegmentedButton contentarea and disabled state broken Fix padding and add disabled states for the group button assets. Change-Id: Iad7f9022de895fbd6875989289f600d098145b1b --- .../btn_group_disabled_holo_dark.9.png | Bin 332 -> 280 bytes .../btn_group_disabled_holo_light.9.png | Bin 335 -> 272 bytes .../drawable-hdpi/btn_group_holo_dark.9.png | Bin 265 -> 0 bytes .../drawable-hdpi/btn_group_holo_light.9.png | Bin 279 -> 0 bytes .../btn_group_normal_holo_dark.9.png | Bin 0 -> 280 bytes .../btn_group_normal_holo_light.9.png | Bin 0 -> 272 bytes .../btn_group_disabled_holo_dark.9.png | Bin 294 -> 226 bytes .../btn_group_disabled_holo_light.9.png | Bin 285 -> 224 bytes .../drawable-mdpi/btn_group_holo_dark.9.png | Bin 216 -> 0 bytes .../drawable-mdpi/btn_group_holo_light.9.png | Bin 227 -> 0 bytes .../btn_group_normal_holo_dark.9.png | Bin 0 -> 227 bytes .../btn_group_normal_holo_light.9.png | Bin 0 -> 230 bytes core/res/res/drawable/btn_group_holo_dark.xml | 22 ++++++++++++++ .../res/res/drawable/btn_group_holo_light.xml | 22 ++++++++++++++ .../group_button_background_holo_dark.xml | 28 ------------------ .../group_button_background_holo_light.xml | 28 ------------------ 16 files changed, 44 insertions(+), 56 deletions(-) delete mode 100644 core/res/res/drawable-hdpi/btn_group_holo_dark.9.png delete mode 100644 core/res/res/drawable-hdpi/btn_group_holo_light.9.png create mode 100644 core/res/res/drawable-hdpi/btn_group_normal_holo_dark.9.png create mode 100644 core/res/res/drawable-hdpi/btn_group_normal_holo_light.9.png delete mode 100644 core/res/res/drawable-mdpi/btn_group_holo_dark.9.png delete mode 100644 core/res/res/drawable-mdpi/btn_group_holo_light.9.png create mode 100644 core/res/res/drawable-mdpi/btn_group_normal_holo_dark.9.png create mode 100644 core/res/res/drawable-mdpi/btn_group_normal_holo_light.9.png create mode 100644 core/res/res/drawable/btn_group_holo_dark.xml create mode 100644 core/res/res/drawable/btn_group_holo_light.xml delete mode 100644 core/res/res/drawable/group_button_background_holo_dark.xml delete mode 100644 core/res/res/drawable/group_button_background_holo_light.xml diff --git a/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_disabled_holo_dark.9.png index bd353ae5cd70077db9cbcb7782769a3532da9e93..00e8f0688c0c0a85a0d7f44056d9d45f1824c158 100644 GIT binary patch delta 250 zcmVbby zm*Ls7XI$UDePcrx7Zw)&CMYQQP>T}7e_ya`x=mmxT0>f?))RDOU&;$vDjb0MSh<@4|a`egFUf07*qoM6N<$f&z1C AtN;K2 delta 303 zcmbQibcRW>Gr-TCmrII^fq{Y7)59eQNGkxb9S0kb^jan>N0nJe&L47fe6g64SZ{!@y%(Fz2I_fX1E!f*#VoxjBu$0Zkt~WQ-cH2dDv%c zmEHT1VRg?#Pg%KyAO?ZA^&c2C_2*2_XlMUX#UkLqzz8Plm<(Q+7rD+Xju%U~z@gB< zzyu~L8ibB-1uESk#^7RYb6_EZ!mWpl-wqfi|JeEVh3~1(3YImEs_S3>nj-%F*zaBc vgd&&UPwR3rFm`%zw|D6_&*u!rk2&KS)dRLn`qTpq0tQc4KUSA@P6Sbm)@RO~$;80Gz>G)9-}LnKf4C%B2v{yJDJiMI#l7EGr-TCmrII^fq{Y7)59eQNGkxb9S0kb^jantVWY^m6Q6Oz-GhtzIbBN@*)x#!}xISpH9-rcQM<#=#Y zf=t4lk`gthGu+2ETPYpbz*MhrQ;@MpZimLnK8_C`ITRWgn83szmItf341fyxhE~xy=Uf5IQDsm-SdNc zKUuA_U;fH?m&nue$?y6ipWlvnZJH@tP%bB5X%O&nWv(UHx3vIVCg!0DYTt AdjJ3c diff --git a/core/res/res/drawable-hdpi/btn_group_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_holo_dark.9.png deleted file mode 100644 index b86c65abe7600d86863dc5cb9ea61addae998cb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbd3q*#ibJVQ8upoSx*1IXtr@Q5sC zVBqcqVMg_Pcu@EM-`~~W-{0SVNVVVp^9A0|frr}{ zKK#$QYSDp$S&Xx!{Wfc5XRx2XU@|A5^554hD}%+(&$qwsJbl8HDSJ}V(#n|Tr!{FF zy>TOAT4ST5Sof93o72zR9a}s#ZRX_0#4Uj)3T=mjxOJ1J2{QaGRNvOzcF6Tgjh(e%{{>ckQ!A>dc2T7H2r{v@aElI-;Y@&~sYz V%GPyar+}Vd@O1TaS?83{1OU^&WsU#< diff --git a/core/res/res/drawable-hdpi/btn_group_normal_holo_dark.9.png b/core/res/res/drawable-hdpi/btn_group_normal_holo_dark.9.png new file mode 100644 index 0000000000000000000000000000000000000000..b2120f4d3cf1db3487d012d37074318501d7244e GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbd3q*#ibJVQ8upoSx*1IXtr@Q5sC zVBqcqVMg;!khe?Uyo{DMlGaq$FM@LsZJ-xz` zo%#3o?XCI$@9*C)U%u4t__A4G!<^rLe}7+pZ-4!NuIV;%d;ibmknj_fFs->#aEa%? ze}E`!+hv{$cM4{OMmk$ZWUz6F?&OiTuY2<2=Vx{8T^9QK@A>`w&fT9P@$c)eudmtG z$L|kwojzgW#GNS_85Ml<)0#Ao-nbDlt+COOr~As}&FSa&sVu1%;Zb(*+3B>x<5(se Z18cSJacN%z3!pC;JYD@<);T3K0RV;!EN4&xOTKc&;Cr=$XaG=rsWdD~h zU+(WviR6foJ9GN<>Jvwgs`lu8e0zKQ_WAbp`_3OYu%RjD@K3w?e}BGxettf`@Z{r* zzvp*0JQQgRJnYV^e)hwEme9Zii?a-8d6!2{HQmyjnjz)4!sh>%4-cKMhOdw7TFA0Hpze(Cb% z_X{-to^Lvwu|6H_V+Po~-c6`k;OaSW-rmGtNTe|zSQ4HG8{E}1b=!q$gp38Pz*=%xut zTAKTk4?c=zD`MES)Q87}NvGn--o_hT9jpZ_eli?6-cX?}@ZYgNrAMNT%~e65THxgl zS%*DxH)SRq+|hJs7E65eRA4x7e4h@V9{k+Eeq$;b!fqr7}boFyt=akR{0Hs57OaK4? diff --git a/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_disabled_holo_light.9.png index 25aefd2a282c35c0f3157c3969e24b2c932bcbc5..1dfc7d365faa9d250c08242d45a4e4f53ce13ae8 100644 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QY^(zo*^7SP{WbZ0pxQQctjR6 zFmQK*Fr)d&(`$i(O`a}}Ar`&K2?zN9Ie#o*>$$;_es0dm7T0(6RaL+2OSbA*@Ptj8 zIyKZ;tm4m)kGgDZZPqW^9vL;f{P_6zi>{d)w2mY)TuhiD;Sd|6H_V+Po~-c747$QaSW-rmGtNTe|zSQ4HG8{E}1b=!nQ|6if7r%JOfRJ z!wEB1d$3A8yKpK&Oy-rtqk9fHtVftEuGBC*N_N;I+VOvZyOEwaJJUw?iG6n&kG!6E zmQnIdi}OZP&V>!3x_Zr(o(40fi!^JpEoSSNvdQ}J!AK&?G3b6mg5@a-sbdg9gPCmg zY6pAHFOjI3!qVJ7`O=59#%&g78)opgH_mVPA+lmAXV$Sr+s$5HU$i_@J|#oSC(E{D eZ51k#D}f zzFvO$^5t@YR0d{d=GU*Uua{rgofvHKA<@8sXMx7bprfok%6O zK0dzR8#Ir+tWQo(E=~D&b8~urQlML5qA>@TNQA_M*WzvrQ?^N;TX)fX7SI(8p00i_ I>zopr0F@F+o&W#< diff --git a/core/res/res/drawable-mdpi/btn_group_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_holo_light.9.png deleted file mode 100644 index bf4f9b2c03928fe765abb653c48849ca069d5b3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QY^(zo*^7SP{WbZ0pxQQctjR6 zFmQK*Fr)d&(`$i(t)4E9Ar`&K2?zN9IUAlmP_O3YyWj?cSWc61`ni;&O5fFOZU34F zvKbf{xNviEol@rBQ~&>;A~W-0rX=2k>i_@#7MB?2aIxD7u(vacsD`fE(NK6G)=TxORPgyuFk7;bjv#HOe0`9zMd*HAyQpromMA!c|rg#xU|eU?pj(<0%FPfHCU>NJ SFRupBK@6U*elF{r5}E)^k557X literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/btn_group_normal_holo_light.9.png b/core/res/res/drawable-mdpi/btn_group_normal_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..7e25ad35d3e64c0c15e623babe8393d0f315e0ac GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%QY^(zo*^7SP{WbZ0pxQQctjR6 zFmQK*Fr)d&(`$i(9iA?ZAr`&K2?zN9Ie#o*>$$;_es0dmQwI(lXj1#5ZfpD3d{zopr0877El>h($ literal 0 HcmV?d00001 diff --git a/core/res/res/drawable/btn_group_holo_dark.xml b/core/res/res/drawable/btn_group_holo_dark.xml new file mode 100644 index 0000000000000..553f023712ab6 --- /dev/null +++ b/core/res/res/drawable/btn_group_holo_dark.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/core/res/res/drawable/btn_group_holo_light.xml b/core/res/res/drawable/btn_group_holo_light.xml new file mode 100644 index 0000000000000..9c89eef57ecb2 --- /dev/null +++ b/core/res/res/drawable/btn_group_holo_light.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/core/res/res/drawable/group_button_background_holo_dark.xml b/core/res/res/drawable/group_button_background_holo_dark.xml deleted file mode 100644 index fa007851fe1e5..0000000000000 --- a/core/res/res/drawable/group_button_background_holo_dark.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/core/res/res/drawable/group_button_background_holo_light.xml b/core/res/res/drawable/group_button_background_holo_light.xml deleted file mode 100644 index 1e74ec78c2b41..0000000000000 --- a/core/res/res/drawable/group_button_background_holo_light.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - -