From d572a03ad8f4e313cb20fa4059c589a5eb4268dd Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 23 Sep 2013 17:41:16 -0700 Subject: [PATCH] Use a generic icon for Home It's only a *foolish* consistency that is the hobgoblin of little minds. Bug 10849877 Change-Id: Ice60cbb13a754edc104ae8630cb3d8dfe637d1af --- res/drawable-hdpi/ic_settings_home.png | Bin 1370 -> 1154 bytes res/drawable-mdpi/ic_settings_home.png | Bin 788 -> 850 bytes res/drawable-xhdpi/ic_settings_home.png | Bin 1888 -> 1504 bytes res/drawable-xxhdpi/ic_settings_home.png | Bin 0 -> 1973 bytes src/com/android/settings/Settings.java | 39 ++--------------------- 5 files changed, 2 insertions(+), 37 deletions(-) create mode 100644 res/drawable-xxhdpi/ic_settings_home.png diff --git a/res/drawable-hdpi/ic_settings_home.png b/res/drawable-hdpi/ic_settings_home.png index 42354cd7c2fc25cfd5e05081c4fb615aadae3445..ce1a06c9a90597ee8f46df1046ccc4fa606b38af 100644 GIT binary patch delta 1079 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 delta 738 zcmcb_Hid11WIYQ51H;YYP4z&EDaqU2h2ejD|C#+j9%q3^WHAE+w-5+3Ub)=PO8{#pF@x5l2`_l{QkI#1qt_1xUzcW=(j zoVaf9%rx__(T5hQag?5#^3+dz^_H2(Ob*Qr@|<+tH`3Q+brrMc`G*|M&N)Q~B&YjG z6dg3LDiPpw{^%i)Cs=)^L*l|y^$C+0_rFlenV{4zEfe4HJtslX+QG%iiR(+GGb2~a zh7P;>4=fKqbnNbFhn9Q}?Z63Js?X~j1)534`EXnnhEM<~R&3d_T zpVy>=I!`9)3fcrjM+zorPk;UCRhGNC0IOZ#9)S$M4fPAJF{OlVk1#%(n!0w~7p?an zvkogn#avu1rt$vg={*&$^5-(ci`KNxGtv+Zkm;`o4pKSr(dO6u+%>+(6Zzt@l4Cu# zOMYG_5>)t1xM0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000JJOGiWi z{{a60|De66laVhMe*~~eL_t(|+U=S@h+I_^#?PHuNhBsL1R^RyNHAKYh!#pv5D|+l zOcAlM@Lz1KL`w}JokB94E!wth|n zU(>~s9_Y2{5W8_rZ~~GO^ek{i1uxQronHZ-b0(w>X+mby1$Y~n4}!nd!(W>R-pTdR zcvO`9!@vnwfARnw;INB5tk-a#C$#Oxm=dAnZ6SLam{mdd^z#p3#w~ajJEPzE*jeBi z7u&okvBE0|V z9Bb5+2qizI=X-#Qp^X0o4$!|NnD|Xjl$l^A9niMEf3J(0Lo{bSQzDGICp;GjUjTN8 zSR1`vz)yPYs)*UGefU1-GKNmZgo=`{D%mf9%|V!ryf-U~Y6W4NwXfBt)Oe>vD0xfx zByc_~S~r0=D&kwf5qjIKbNY39TU^{4M}hS*r+w#gigL22P2+l+-h#Ta3G~l-0bT;GX-8IGKLh(*T%4Dm zf4bN~=KG+qzV2y`xZW7&eag{uzNT8dwyXjE!Q?~Wu6AJM`xUT_UKx5<9|g`h!nsv` zt?+%G(VU)xaoVO_J@>n+>A?e7&HyW?kF}AN-W_cmZ+|WRMS7J|wZ*Nc304iiYVO?K zqbTP)LCYr=Uu8g|TShjAe*yNdkmLipe+v$*Z^^F)%e9~!ss`r;)c|mV?oV>5$^bt{ z4g%i*+vzVe`+gH}GDB#R@HtN^C(qG1Z&xh`{r7_`g7F6kyS@jwq>24jRR{bQdx_pw zX3VvP;P1aEow?znuE4-+M*mWk*dMoL@mRV|HCy}cFm!q#w|&+&=U84aZo)2 zza4fBoBYx)lg$Pf8Z#|0IW00XR53R? zGB-LfG%YYUIxsMWyYWVo{stEsGc7PVEiy1vF)%tZI65;pEigAaFfbT-%}SFm2Qi_^ Bi5>s| delta 1802 zcmV+l2le>i3*Zir8Gi%-0001Bxm5rF00Lr5M??VshmXv^00009a7bBm0000;0000; z07l7cJ^%m!33hNnX8-^IKmY&$Kmh9V_+S74253n{K~!ko?b%z5U1b#q@ZY!hOlP1l zwP2|hBIROfL1Hz5a1(`?sPV~w5%obaYGRax2cHNSV>B8~e1FgvqlrOdd@!15LX0NF z8zh2>VoEKSfE7x(OsVu@JIu^E`|rcqb9&D7%yc-Wyx8?+Cj0EYzqQu)UzcyKZ*!VX z)Bih_@umeuDph-z4U*4@lrC82ay8h^t!TYs#a2#T)so{oh<-}`rDHr;gF z@N05aMBbeFBsWK@5i@%$|5)x`x*iw)Dso@zdOiQ2&H9L}%ibiPHNp)eC3Sv~hO6{Eam!klve(3w?C}zhI9jig+FutN?B$ zzOPYy6o1{C z4a;q;t7$R#gD9>Yeq-cz+yWP$catcs{V$OLg@2Fj?a!Z>-9!&C5b_|B% zN+ziA88NTZj_$|+YuW_QJkB&dfMJDwqU#pD9Qp{}Xv?77(FznDGj=K_`lDX|BYn3j3s-t$LjXKza$^~VJ%_tA3aFMN6chXAZW_PuoF>hXN3Pr8k zV)M8?xYRZ&>;qd31nWu&u-S&CkXnTrx7%s~jV|i;YNyLk>H0mUT?qbd0h=?BTvk|N z;atmd)<_Iuv#UWzr&Yc7ZGUtRCb0`#Tz}xO!#KxD6$mz3ON|||v&Ev*ifmkA#y0CM z;$Iq^2j?M6Li8b`o{NxgtQi2?BE9X6Z93t-w5j;;ZL@UoK|s8QMP;epllAb!!JUFOx;4*nT>dqr>8=$mbHZy3z_ zkF%D_$W;*dg}v5UP*g1fal5bUw!f~zK~IBot;ei^#sqi>s64HR8Q0-4kEx?gN4*+iReuvSYOi=yqodo7j1d2fk2s(bz2G`#uD^;NBJX#O z#>1^S-U^;`QU!XexL0LL-HuVFSg@$H?AGB}FLsK4?R}dGm7llf*nz{I8%)J3oewnl zt*>~Gv?bMb$_Ywrw6VOqMnhedaQble~C&@2|TiDeDZRu&jm;FOM;FLwzq)mN$Zp4ujvPWg2 z^%rhZ<1efs6}N_Ml(y=x9B`**sJDz>ClE<*k2_?cb;;IVrO{DZWp6;oZw$rOiU^d} znc9Z7t8%~ZEW?0pmNNVny?^9YFXtgDvD4M!DZAFFz%ZNk-7ncaphCeFibfRYV_zBV zUQyg?TJb9#)u0X5v>O(!)<=BKd_Rj7ysa%mCtQrZMk~-Lu2)%fpYe_c2hN7>8H$E( z-Vu@WGMD7W72ETYZTV5|&s54vrzmStp`^}qemB&h-x1_pNseVxoPXGF420u`rK{t# z=7OZ(@V)8_4yi>i)!amix8rdKtej#h9O|(-Nm;%sHEMg@snKoA@oQZy-i-%GSJAy& zr9l}F{b4vuCZeAgJ4x=!_Pm_rw#dZmaZXrLGMxwd2bJ@AKFN!@X!-HWsZ*hjT$*Q- z%x58sSxj>iKd|MJ128Y5liw<}{tA)AV0#AKf%$Ur$1lO$8SkF)c7NEipD!F*Z6dHaayhEigAa sFfb{qge{YP1s57IEif}JF*Z~&HaajiIyEpYFgH3dFj)6Ik&~|lG3~8z_y7O^ diff --git a/res/drawable-xxhdpi/ic_settings_home.png b/res/drawable-xxhdpi/ic_settings_home.png new file mode 100644 index 0000000000000000000000000000000000000000..aac8773fda55cbc7dd4475c0895cbf02dca3b2cf GIT binary patch literal 1973 zcmbVLX;c$e6dn*LQbk3v7K@J25NILEBxIFbr)Q4Ypb%k7gP}SP!^$T5jo;UUqtM3tUo&E+<9~FeBa&Py=n5usYBho z+#m=VDxD@)fOCOeTwTEXZnl{Vjt>b*G%*8@C(J4X3JEoM912S@)k0K(sx;O`=g}Yt z8WgWpMibGp2)-J}s46>#YQgk?4M9O67QITHh!Sudx=^bVkRBX8L4vg!0ckc%MwjVD zXo7ayVgov3aimhcI8n{hkV1mtAPXNjz)(U3Td*XZk#7-@UisyNZ@ZaBf?q+1L;M(@YC4+^vk@x74CHV){xE}%&}noA4PgWz96po5r_2tv=N(adHu)y$;ghJ`eQ$K%<3Fc<*<5n#0H2$dy3XPh|TL5v#J2CbgZ z;yT#wQ5A=q2muLX+Ft^um&x8Z))`+n3bc%7QR!(2l}^JjdtI;4MnZx9mBw4qMx|Ac z(iEr>HyPC6KH?`1kU{U>9moy@+3=$bT5u_mJy%?mzlmIw-=hS2v$Aqu=hm1sr61X! z?0H&osObvrz~h#@-kzEY&e3Omk0|U1HF>?u9@N;Fk8U;Sxz)n!?c+l2tLy+lQ@}AC zh||B-_325_xhXRZYv((s5C>-}_~3erb6Gw8v6l^KGcfYWBSI+%x!>LQ#ba^wX2z-qhj8 z>KYpBEB(6m`bg@02c0~zOniT=BO5+3W@~k;O_%@FR+IBy24%dfxr5Ucv!bi6Y)Gbi znLBgvf;5|tQ|nOcr8B0{<^GwqWmKl~?Fqe=!!u%==btrfd%5h?ANBL8lOt!(E6RcP zP@L{gwl?m~_gWZ~_55%ZufsNULWtS14#{a9ahHqZwhVJg!KAl0lKM8eVA5P6>w<~Vz6%{Z$rrl3t$tY7sv^p{ znYoiKsU17#I1K^VInh@*b^cKqvvQT!*uNg|t}9eH%gLLU#C-X~`%!Wa3Ca%IU0Gnv zONA~zJm8LpBTJ>3B{zD=hxR$i;qlfRX$BcEUGct=+_Hu{y4Z1N#*%`Mci3$JR!}?c z>?BVpuX(IUq8k+h)v5JeY_f-2m zO(-58G>hO>%&7KPTys1;$E&Zh0;>0+M#(yhMFqA;Fa&kYr?oq>=Ms&wX@nFl?{o-d4<&W#fN0tT_-)rR8!|~hwLhg-` zKTSLy6f%TgxzSU7{ZH%IvYqS6nFcdNSRkX|U+OHsZ~`WXOVJ!_#h! ziOybE_M-ZQRYLZKh97~U6u^XmxB_v6{;8%s?4FzA04>c)C$4Y5;{gzmR1zsJ4PCI} EPn!VfLI3~& literal 0 HcmV?d00001 diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 5c77a9793e2..ac67a38af5c 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -667,50 +667,15 @@ public class Settings extends PreferenceActivity return headerIndex; } - private boolean isSystemApp(ResolveInfo ri) { - return ((ri.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0); - } - private boolean updateHomeSettingHeaders(Header header) { - final PackageManager pm = getPackageManager(); - final ArrayList homeApps = new ArrayList(); try { - ComponentName currentHome = pm.getHomeActivities(homeApps); + final ArrayList homeApps = new ArrayList(); + getPackageManager().getHomeActivities(homeApps); if (homeApps.size() < 2) { // When there's only one available home app, omit this settings // category entirely at the top level UI. return false; } - ResolveInfo iconSource = null; - if (currentHome == null) { - // no current default, so find the system home app and use that - for (int which = 0; which < homeApps.size(); which++) { - ResolveInfo ri = homeApps.get(which); - if (isSystemApp(ri)) { - iconSource = ri; - break; - } - } - } else { - // find the current-home entry in the returned set - for (int which = 0; which < homeApps.size(); which++) { - ResolveInfo ri = homeApps.get(which); - ComponentName riName = new ComponentName(ri.activityInfo.packageName, - ri.activityInfo.name); - if (riName.equals(currentHome)) { - iconSource = ri; - break; - } - } - } - if (iconSource != null) { - if (header.extras == null) { - header.extras = new Bundle(); - } - header.extras.putParcelable(HomeSettings.CURRENT_HOME, iconSource.activityInfo); - } else { - Log.v(LOG_TAG, "No home app icon found"); - } } catch (Exception e) { // Can't look up the home activity; bail on configuring the icon Log.w(LOG_TAG, "Problem looking up home activity!", e);