From 5172dc2f36f9c417befd0957ce2ae20f9d083a88 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Tue, 2 Sep 2014 14:59:06 +0200 Subject: [PATCH] Status bar iconography updates - Use new assets for location, flightmode and "more" notifications icon. - Update icon size and clock to spec. - Change from fixed width of the icons to WRAP_CONTENT, so they look more evenly distributed. - Adjust subpixel rendering of battery icon to match other vector icons. Bug: 16161255 Change-Id: I0a80f223b7d532bc53a201cff37b8f1cb09f08c2 --- .../res/drawable-hdpi/stat_notify_more.png | Bin 285 -> 0 bytes .../stat_sys_device_access_location_found.png | Bin 846 -> 0 bytes .../stat_sys_signal_flightmode.png | Bin 1028 -> 0 bytes .../stat_sys_signal_flightmode.png | Bin 998 -> 0 bytes .../stat_sys_signal_flightmode.png | Bin 720 -> 0 bytes .../stat_sys_signal_flightmode.png | Bin 1302 -> 0 bytes .../stat_sys_signal_flightmode.png | Bin 3868 -> 0 bytes .../res/drawable-mdpi/stat_notify_more.png | Bin 233 -> 0 bytes .../stat_sys_device_access_location_found.png | Bin 667 -> 0 bytes .../stat_sys_signal_flightmode.png | Bin 746 -> 0 bytes .../res/drawable-xhdpi/stat_notify_more.png | Bin 1143 -> 0 bytes .../stat_sys_device_access_location_found.png | Bin 1102 -> 0 bytes .../stat_sys_signal_flightmode.png | Bin 1335 -> 0 bytes .../res/drawable-xxhdpi/stat_notify_more.png | Bin 1578 -> 0 bytes .../stat_sys_device_access_location_found.png | Bin 1823 -> 0 bytes .../stat_sys_signal_flightmode.png | Bin 2052 -> 0 bytes .../{stat_sys_no_sim.xml => ic_qs_no_sim.xml} | 4 +-- .../res/drawable/stat_notify_more.xml | 24 +++++++++++++++ .../res/drawable/stat_sys_airplane_mode.xml | 28 +++++++++++++++++ .../SystemUI/res/drawable/stat_sys_alarm.xml | 22 +++++++------ .../SystemUI/res/drawable/stat_sys_cast.xml | 21 +++++++------ .../res/drawable/stat_sys_data_bluetooth.xml | 4 +-- .../stat_sys_data_bluetooth_connected.xml | 4 +-- .../stat_sys_data_fully_connected_1x.xml | 4 +-- .../stat_sys_data_fully_connected_3g.xml | 4 +-- .../stat_sys_data_fully_connected_4g.xml | 4 +-- .../stat_sys_data_fully_connected_e.xml | 4 +-- .../stat_sys_data_fully_connected_g.xml | 4 +-- .../stat_sys_data_fully_connected_h.xml | 4 +-- .../stat_sys_data_fully_connected_lte.xml | 4 +-- .../stat_sys_data_fully_connected_roam.xml | 4 +-- .../res/drawable/stat_sys_location.xml | 29 ++++++++++++++++++ .../res/drawable/stat_sys_ringer_vibrate.xml | 21 +++++++------ .../res/drawable/stat_sys_signal_0.xml | 4 +-- .../res/drawable/stat_sys_signal_0_fully.xml | 4 +-- .../res/drawable/stat_sys_signal_1.xml | 4 +-- .../res/drawable/stat_sys_signal_1_fully.xml | 4 +-- .../res/drawable/stat_sys_signal_2.xml | 4 +-- .../res/drawable/stat_sys_signal_2_fully.xml | 4 +-- .../res/drawable/stat_sys_signal_3.xml | 4 +-- .../res/drawable/stat_sys_signal_3_fully.xml | 4 +-- .../res/drawable/stat_sys_signal_4.xml | 4 +-- .../res/drawable/stat_sys_signal_4_fully.xml | 4 +-- .../res/drawable/stat_sys_signal_null.xml | 4 +-- .../res/drawable/stat_sys_wifi_signal_0.xml | 4 +-- .../drawable/stat_sys_wifi_signal_0_fully.xml | 4 +-- .../res/drawable/stat_sys_wifi_signal_1.xml | 4 +-- .../drawable/stat_sys_wifi_signal_1_fully.xml | 4 +-- .../res/drawable/stat_sys_wifi_signal_2.xml | 4 +-- .../drawable/stat_sys_wifi_signal_2_fully.xml | 4 +-- .../res/drawable/stat_sys_wifi_signal_3.xml | 4 +-- .../drawable/stat_sys_wifi_signal_3_fully.xml | 4 +-- .../res/drawable/stat_sys_wifi_signal_4.xml | 4 +-- .../drawable/stat_sys_wifi_signal_4_fully.xml | 4 +-- .../drawable/stat_sys_wifi_signal_null.xml | 4 +-- .../res/drawable/stat_sys_zen_important.xml | 21 +++++++------ .../res/drawable/stat_sys_zen_none.xml | 21 +++++++------ .../res/layout/keyguard_status_bar.xml | 2 +- .../res/layout/signal_cluster_view.xml | 17 ++++------ packages/SystemUI/res/layout/status_bar.xml | 6 ++-- .../res/layout/status_bar_expanded_header.xml | 2 +- packages/SystemUI/res/layout/system_icons.xml | 9 +++--- packages/SystemUI/res/values-hdpi/dimens.xml | 21 +++++++++++++ packages/SystemUI/res/values-mdpi/dimens.xml | 20 ++++++++++++ .../SystemUI/res/values-sw600dp/dimens.xml | 3 ++ packages/SystemUI/res/values-tvdpi/dimens.xml | 20 ++++++++++++ packages/SystemUI/res/values/dimens.xml | 18 ++++++++--- packages/SystemUI/res/values/styles.xml | 3 +- .../android/systemui/BatteryMeterView.java | 7 +++-- .../systemui/qs/tiles/CellularTile.java | 4 +-- .../systemui/statusbar/SignalClusterView.java | 11 +++---- .../statusbar/phone/PhoneStatusBar.java | 16 ++++++++-- .../statusbar/policy/KeyButtonView.java | 3 +- .../policy/LocationControllerImpl.java | 3 +- .../policy/NetworkControllerImpl.java | 4 +-- 75 files changed, 331 insertions(+), 157 deletions(-) delete mode 100644 packages/SystemUI/res/drawable-hdpi/stat_notify_more.png delete mode 100644 packages/SystemUI/res/drawable-hdpi/stat_sys_device_access_location_found.png delete mode 100644 packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png delete mode 100644 packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_flightmode.png delete mode 100644 packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_flightmode.png delete mode 100644 packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_flightmode.png delete mode 100644 packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_flightmode.png delete mode 100644 packages/SystemUI/res/drawable-mdpi/stat_notify_more.png delete mode 100644 packages/SystemUI/res/drawable-mdpi/stat_sys_device_access_location_found.png delete mode 100644 packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png delete mode 100644 packages/SystemUI/res/drawable-xhdpi/stat_notify_more.png delete mode 100644 packages/SystemUI/res/drawable-xhdpi/stat_sys_device_access_location_found.png delete mode 100644 packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_flightmode.png delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/stat_notify_more.png delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/stat_sys_device_access_location_found.png delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_flightmode.png rename packages/SystemUI/res/drawable/{stat_sys_no_sim.xml => ic_qs_no_sim.xml} (94%) create mode 100644 packages/SystemUI/res/drawable/stat_notify_more.xml create mode 100644 packages/SystemUI/res/drawable/stat_sys_airplane_mode.xml create mode 100644 packages/SystemUI/res/drawable/stat_sys_location.xml create mode 100644 packages/SystemUI/res/values-hdpi/dimens.xml create mode 100644 packages/SystemUI/res/values-mdpi/dimens.xml create mode 100644 packages/SystemUI/res/values-tvdpi/dimens.xml diff --git a/packages/SystemUI/res/drawable-hdpi/stat_notify_more.png b/packages/SystemUI/res/drawable-hdpi/stat_notify_more.png deleted file mode 100644 index 2fa0293d692c89fe207d9b6aac40f6f97e255a8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTXIX(`I!uD0f?c{F$T{!n;uzv_ zJUKyvRi*hq*Z=H)*C#XBZje6w@&CX2AV+4iX0Cse`RtO5&lel<{PLImo*?yQeya_T zn)2bly(kaUuIFZarC$?%RweOr9bDPx(tIxX=z{-@6-^B)&3qsxUqs6H!^M-CLwI}k z%WrqwUAU7uyKc?#+zZ87l2e>@*FW^@VHW%A(E592>IBxQJWN`#jm~%L-Z=K$R+##K z|H>da#@<;Dy3H*A_Al>pbXY8P!r;02x2m^>C)w5>m^V4cV-?fB|MNf3Pv27O1oT~l X??jUgb6oBMy~g0_>gTe~DWM4f#~*M` diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_device_access_location_found.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_device_access_location_found.png deleted file mode 100644 index d43d1dc7e0e5d29bbff897ed1a469dae4fda7ecd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&!-9COJOQ-Ga3UL%@J%3kFG=_!M z&@hlkBrs9g+1T*n5%++=GcG)?214=&T#g)2|IpvdBHD7-L4-y0NJPYy42Sfxcj+5K zb8>HfKW@$Hdw=KEyYX``+u8=NRAi`Mv*zlgkkHU`-j_~%I$~(Kitj>`Zo`ttlg@cq zsb#h=nLjB^Mb|sZJ6XE%f5RHxi2d>vEIv1+wtl_em~FOg)3mAInPi#lZZ0y;7JktG zbu+_W`G&g&%)cJQ9$2Move7l&bFR3-*7MtgHqJfecJ2Na)@7U@1S{Cquv*97m9Tht zVBe}Tu{X>W3_05k-5b^?_K272i```_{<)m#!0-42iKneUcu8!|JD=}-F}g2h+N+bz z(^fm@X=ToN)+_x?Z`zS9zjy8Q(9N8`r2E^u?Mv=XS|^t9SLsHD(VNEnefIW@@0jF+ z?&a15aq zkq^y<%A&WwPuy;-Iq!C8<`) zMX5lF!N|bSSl7@%*T5vi(8S8n(8|nR44$rjF6*2UngF#xTx$RT diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png deleted file mode 100644 index dcf86c04b99731b889953d9323a7ad9dfaabfb5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1028 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}&!3HE7PPGUDDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiYCz>J3=F?O+Fmd)lo~KFyh>nTu$sZZAYL$MSD+10f-TA0 z-G$*l2rk&Wd@@jkv%n*=7)X17vD?XPI|c@(E1oWnAs)xKPBY992^47izr9+Gu{+_2 zMx%fdo1;shPEf~Gj}{FxG0h~^u4`gqWy`i)a57-w7G&AFVd{cq7nFK4lwXE)I2|xv z;koeSQ@idnmv>ITyVs<0!<*!?w14%_&i;Sbv@L_NQ2Nb5xmI14$xC8_KFdc$w4dI# zVVBRPSxfvpf2)=mTg?se1J89A``#t$~kJD!RtGe62WjEL+ zi7?J%6FXDMS;2jWU5}}~@tlwl6Wf{l%ysO2uJ-Y%1qXv2CO^8$@T{TzKxl%*i)}X+ zA9&94q5Ee=l60Fw6F;Ny0eAKtY5rc1gg@~7n8i@X@J)5CK8x?c-Hn9_#~3!~{b39f zX7Ww1=6s{ax@LmUya^I)?-)zjg{(Kc@~|y(4(5wsl+(G8y;Xh((;4f4{eH9J*Yd2H zCiN&ZmBrw$EAO*O&s5Kf9WnDg-E3%c_Bzw68!Yk@K26-B^m57)^+~(V>K}8t(8xR8 zVbi9jPa7ZHxp(k{sYMlIirFoBW~5>q{xykJRVexMGZdcTDC# zP;&dBr%KW7BlX-8%zQKc%52E-e0?Bt`VRGrpJo29Kes{hLg9ni-Wz!Ku#3eWa?Z0_ ztRlB#hSi4ELRT8yAJ`s9UVc=gQ*wd%L}wP+;sx3VCRUidJ!h=e`CxkE{An!ZZU4fL z3$L|)aB;@^f+}IzwL3HCPAQ4KWcK^o`{h?2ElLqn*;`gwwK%7%O|zR*rsA?t`lMwl zdkw4mCtqoknY3(fZhmLJcY{oIyrc6a-_4bOTbD$6R;gy5{ARt%fqS|3&V>`cI0dyY z5uUf;C+qZ@YaYE`Q9bv&)*U)DmFJXzL4->4k@prCuKVdNzm0Xkxq!^4042^XSEOd=bLJSP7 z3{9;}Omq#*tqcsp8m~2@Xvob^$xN%ntwH@xo;^^5B*=!~{Irtt#G+IN$CUh}R0Yr6 b#Prml)Wnp^!jq|>+{obR>gTe~DWM4fjxeZT diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_flightmode.png deleted file mode 100644 index 5171333c3b7d9ae3bb8c68ea7713077e9f160e8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 998 zcmeAS@N?(olHy`uVBq!ia0vp^vOp}&!3HE7PPGUDDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiszBw<3=BX218JamsR0ASs{{rHs~HRo;`x)}kGcWXvL$)D zyDx`7I;J!Gca%qgD@k*tT_@43{1B@T^vI^j&Gf2n-StDaQuIDd0dOg z!Hz&CMHdlAmye4*5;cV!j~-KM4Qt9sPR>mC;+A&g6jS2JN=#O4;>w!nwnfldbdi8T zmlXHe>*pV(=@tLJw_D*zW8%BA^k??g*2ceu6c(rSYz*@HC4c4Htj6mqx?9DsN$g>> zcu?hOt@2eO;cPP(<62(EQs#Xw-OCy#ZwoVi$Mxp-v6DGc7tL;M_g8+o`{dtA?>u)Y zuGGwo4BC67Qu@dr6Q3lrZnf-I?JXx*zA&wSyJf$x9h2FuI$LW`Tl>yJ;TwE&*veRE zJ5}BJ!SKP9xsH{mz2v!q?E$$5JO!7(JU>&$W)Z}|ckEq($d4(E^(^0R*3Ex8hdqz^ zeS_<%OvxEM`+_3{E4a2Z<{Ljae}MUcGv|p(8!uNU9J(a4e#53;G8M)jj?B@CxH3_! z!9KB8u!3#Qrks+7sbvnV1^NZ*7O@=aMH?a?>{@D*YL_*&LG%Id${uK?o-douKzDIN%NW+?)5u=b(T;2F2=H@0XoeG4z8NSU!|P#K3#Mv*MS}P{Srg3 z%=~w1KG)wgcurI8JJiZ1G(l_1_o2MoH&c3AvZrIGp!Q0hNmwJ3V|9JJYD@<);T3K0RVxk Bq89)F diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_flightmode.png deleted file mode 100644 index 1b4576249a958973034680ed633b8249fbf92e12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmeAS@N?(olHy`uVBq!ia0vp^!ayvI(3R2di=ni&{={s+=P@lpc@hF1v;3|2E37{v1@#UFJ8s%1;^ zc6VX;4}uH!E}sk(;VkfoEM{Qf2HMFj%*Zfnjs(#7qn<8~Ar_~nPO;Ap2^2VbzIOLd z=I#uSmIw*Oh)h*B<~o*x$Chl{=qdhz`3I*?ON85oJExAR`8sUa$iaDINo1=_hoPfR zi$Z6mefONmXSUl<9!PyR+x+{Pxt8tG463g^R;em_E)|JA)^$)#HFoM3=b)$crEEE( zx^caGEPl9LTDau;q;(bxg%unMC$4+Egzwab8Izwk&X2hvR&e>F;etp36T6)1PH zMjUTUeQ>6M`9Yr78%F+y&;|T8o|S<+y1WAa8h*IldA~vYfOP`@5AVx%Oy?U`KGe8$ zb@w;^MrQdH(f`ChutoG-lRB~`%`k2Mlf(55#R>8ie0RKdhVE)$2-VfS`px$Dsns4; z`kDThD!MNQ9674Scr49M^o94ViC;V~H7&V3P3(1$SMY;!p&*??nHHff3`()lh{zlV;hcD)(hs?hCNH+YQPw3UO_QmvAUQh^kMk%6JHu7Rblfk}v=v6X>|l`)WOZe?IFWy^`PC>nC}Q!>*k Wacg+`vY-&Cfx*+&&t;ucLK6V1Yb1>T diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_flightmode.png deleted file mode 100644 index fcbfac1890ae85f63fdd16d5ded467a402082eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1302 zcmZ`(e>l^59RGZ``O21CMawzjYD=228ItlaN6gQ#3i&aKa``c5Cc^x>P&q7#VYzP7 zW5QC|bD`x|E`T*un7X!W?IKF#wPj;a0;n5Dg{zxjKQyM+P&9FphBZ^8z511VCmE z04tvnM*Jiy0JCfW?8*Vy5-$kr*^kV^M?GAf!RIek(_VK0akMyYfr$X%biM!r!YV!F z9FFPCU28XYbd|-%4o$>N_jogEB-B@F)mzRId3;nR|Ks zbpcQZIuve{t{t0egAUCk*xu>rmsO#*YL$7k1U$aqo$Tp)pC_jKhQY}eLm<7Srk_!B zsqlIr*D^n@qj_iyYS}!f@#Z=}p9D?lHy+p{4Nu6b)sOZ#a*#D`Aj74x zJD%b*KI~~WJf#rX|7M29)3@$k%poKuq}!UxV=*1(a{G97;`+rpqvBpiBYdU~x%8Gi zMQ;?UGWX0lO~7Bq{yRkPR-y)aNbc2`#S!WZ>;X0;jd{A`tgPvPx zz{kaX3pUeFsx96&ys&`qrD;vD*~f8)|Le1S(3l_5xpyN+Qa%1!LT%vP*6eSpKXcmp zJnu!+;iUo}qFNl@5QBwoOQqknq!e={@thnMe)uo;nh;XSUQ-21@C;}cF8Rlj; zQ&ugYr~4W*^GJrRpRQ`x6CO#5!bs^lz5Ek>?M@X$QPCx0yLdtU$|#-Kcl7xyxhuhm zcfb7EyT-hlbe`Q(R2_eg4Vk0jP$JB;K)w)67qn@PYXD;AAzN42t}BXYMLm0Ei9!QfYc*!W}7Q7Qi)cs0XGKmvg2;_ck%#LoT? DYI7^x diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/stat_sys_signal_flightmode.png deleted file mode 100644 index 455573122e8dac6926e5a12d7bdb08e1f9fe79ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3868 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 Y{FvT+G)|{=3ecGhp00i_>zopr0A9LWfdBvi diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_device_access_location_found.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_device_access_location_found.png deleted file mode 100644 index 61d75110ca38ebcda4af303166e4ae6f06b62903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e4JBqaK_Y7JQ$h~m` zM@DAiL+%^Vx0ZZmtzokEo|y2G`v()(ttA{wHu|M1i){>Gah%dHW4^7}&dGP?<}``7 z8CQS*H>WzSj5%%6BeNT)8nia>ereP*VDS2uCnLl3Lup&n!%a(!J-5Eyj*TkYYhGoF&JX3~@H$#iFb&cBs$ zaaJ9dk469P17ZeSo>w2{U+}i-J!5vmn}iiluFjg{X4577fN=%mR~5ZLEBjl!mP~iK zBftFYg%9Vr-?<9~ujtlHzf-m65jHaCR+>C2nr zw)}tEI(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4N!tD z$=lt9;Xep2*t>i(P=vF0v(<3`~>jQ^Op9lcpkug%HHVL5orNhBv{kwB|Ji-MAe!8<## z>hxmctOJdS&-NC-yFTZ$-$VQMTiaMy9I%i!T3|MRMsR@UA7*n#KZg4ab8n>@F)%SF zaD;4Cxuam<-oSo9tRQvT+QzG@U-wjL?EAdtRm>azRqN;W<(9fGZInu|WstuzvC4bz z0=*?I>B4#8d&Ryvu6s43%DMLCzmMK`1Lm(Nzj8kD|GGH8(D&(@TWbPqm(=kd_uQVh zD!WnM?Eb&Fww1Y8f?wr+oop3Wu5{z7#r)I%O4plZ9e-l8fzifyR@RSJmEM^(S(-~< zW=!JK{vaH|8pn9NG0Y$#2fv6miBxPqQCCj zC3^08(4oMDd9p{6xGRjcGJAB}{}!yd{`gI7(#Ai&Ld{q1MbygA^iHaEL z@Og5*K9k>iU$vK`-Iu=CZ|;?(MmDH~-bcptHiBA{Z5`eP=h4MhT#0P plJdl&R0hYC{G?O`&)mfH)S%SFl*+=Bsh~8+;OXk;vd$@?2>^(GBc}iW diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_notify_more.png b/packages/SystemUI/res/drawable-xhdpi/stat_notify_more.png deleted file mode 100644 index 64327ba3a1bbcd3c7d8da8de62556bda0a9a8415..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1143 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0 z-G$*l2rk&Wd@@jkv%n*=7)X17vD?XPI|c@3cTX3`kc@k8XWDj%8VVe*uPlF|$#pBU zZ~=#z*(3MFg&a)^O)FZXGPG};m>O5#^-U?NbK9Z?Voj}01qtcO9XB}Io6MBvohr;P z*C~6{_xqdjZvFFF{{=Sv{$zCWPrA{}l!fm7a<)}HjMtx?S86Ke6MT7PzbeZQ>v_db zoqfwi>==UVPp}vYOcYrWqBO(t@UFMJ^O`2dUwve7O=HnoR-4ba8>$c7+vd_zu=K0? z1FM4TS{Hp6aVS0VsZ{#U?_T=HQFL+c4eeY+q9>sM=UC~+)6|GqOex5bzJ+<7+ReoAoy=wV&beF7!^Jl*q(`=SI zyqY6?Hgl4Y(6Oi&%3LCk)=t=YPHdL)`2|mIKJ&VKYkx2Iw(tWRCNa%!^j_r=`$TZl zoYc;myK5NlO^SXeTfqDyc0wuN4bL?%mQ)^}^33M*tbP^VpI%BzySKjgFf2NKYH^og zTh#rF|CXjq-}vh0d?r7^dEd)RdpAbtUp}>*)A@nnhWXEKyluFAKyT{Iti3EY;WIa< zNI&dS^g9vsd86pb^!dxrb(~-m{3-ClEw$pMufCFc)VH^9oUU=5KG5`YZCH75&8odo zm+VqZO5gPevYy#^)_orPf$UGU3%S;<>gZUV*}u9W@KCJFbXOE~Illjz{E4VLBV3~Qfj^X=P+m*kI zjdlOu3pm5Dy>YW}0E5xD`wZa?;a2O8?7P#dV{%Tw{v3bf`6n0GeJa}i^*iI`{7d1l z8JM5PXl>lbKck;FsOY7r^r4g{7f|Blb25P%BtbR= r=ckpFCl;kLIHu$$r7C#lCZ?wbr6#6S7M@H66#xvLu6{1-oD!M<{b=sg diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_device_access_location_found.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_device_access_location_found.png deleted file mode 100644 index 192d3f7bbad8c2a6ee54538255c18652b52ca471..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1102 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+eS5K)hhiu0R{01Y44~ zy9>jA5L~c#`DCC7XMsm#F_88EW4Dvpb_@*6a-J@ZArXhS&e)wD5-8AKUmkvfImjhf zNy#j0q3eVaA?}0q3PRF>+>R{V-2XXrb49r2dwUnOx*m|&Ai(P)q8;z*z~kZau~+Hj zz4J-uQ;zTc{$_7=dHI8)caP`He1B%9aeA5XRFMOD!k(s{y?l4G7y3?C5nQ0+>2*`{ z%~OXn0k7t%tGu0JBE?|u9X0KXdd>Rk51Rs79UiXQ{f(o5y@Gws-(HDocy7p9tT$P&10Whd1gQS`!d1gtmOO^M+&d1>B;p? z(if9{f4J-(vkzmqa`gR2c@x8~z2`b1^oZ|4IHSk`@$FAPA2BSvQT|r*E*pYFf-M8KjJMKSE4J#DDx8#kN7li%~(T?@5$~2SMy4vT>m-L-VaZ-$OWgV)`bKYjZ zaanNYYrC@Crqmb?xwr9eTpDWPcFk_waO0=<=560j->Fw%Pjy??@P5muNsV`xg(iQW zR_?`=%c5Cu^Joy)pCvzwqnX=JI^2A-omqZPxgJl-?CA`jyvxlF>|s=6+jMsKmrDX4 zm@LdMOic*!3HF`%#~*YDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fI|H(?D8gCb5m^kRJ;2!QWVRj9I(APN$B>A_XJ`0!#JCC^|8Hx2aYg%@ zP3xq57O})SDQGo`I|k@?DM$!3JAF}UTajSH-Pq8@es{9V9ti=FkUf$Y=ddud^>%!e zFf;6sUm)1(I(O#x&mUIZnRTzuIA85z#DzWmb+Lb6zk0Q5*2I6uC+R(T;_$>{l7}Xv z#?mGCSk3(0g%f{2ZoM`&MDmK8=XS4MC0VV{C3PZ&3z$D}6-d2c_WqW;+#-M5 zF1`y}v%6|@4;t479?yGV?e=u9!Fv}2(I}$_>-?_?o%{N=L7X{2UV=fipkCS{yu|zi zQvrX$T*jvx_Nu)W`x48xCo#Y|`)|V5(m;34bJp@Kb$r@?I4ziTBJcAh)HbIsw*Jv1 z)^M1yhvA#)2F-Kvx0vD|t~>L_`P!+-2gVOdKhK|i#z^&aE_>f?i~COO)_gk8)`c_` zuhwNc&*W~r!0tmh^PBkx#1AMw@O)5~Ah(0rVrC=no1Y#VB8($!Y7>u6pRs>0>mMlx zwu2LE55@dCV4jwE|CE-_o7{xvvzKMLryW$iX7#@;VgFC}DT!tu7bM)2`L}d~w{l?O ztOYM8d=!aGwEM}pVN&GgQw@LS?*Gqx^D=Jq zWq2#1V9wmnwER%m^JpuEcc;WH{i0O=O$pkwUWNDYkJ3r|rf$)BskC;j(WJZOs=968 zm8;U*x=(GoTBh<<_3f0Bh)brcw0qaNWgk7YZuYX7>p8BceEOg#dBEY);Ys&GV&Cz+ z{kv(&REsO?uBV-UyF|e4PNw(IOSR7gtv4Dz+RvZE*vI<+^Mc=r61Vqp>CZX0%sMg zdj5iTCkYGg8m>KTHf(pC<`$n++p}IE?OB8H&F#z&(q^x>zPe57!Pf%^+Y)|Ni|y`X zylrIP!(DrIU-#6rd(G~LOgnws`M@U4o~a$n7niTdHqp2E%oK9K?^>8r^?6pkWz%%8 zTy1u?e89EAke$2ACOwXI4kvfZE|>g&g2GSae+jJp`#dWAQl{r_72CxZZ(NydvfS!k zXyC$^D}BEAPqO={w>z(_+Q%qj`GOnkonOEAh??|e-QDn2!Pl;8s{Z-i7BVFyy^mwN zfpAQknC}Q!>*kacfY&lV=aqAPKS|I6tkV oJh3R1!7(L2DOJHUH!(dmC^a#qvhZXor~qT|boFyt=akR{0As;MZvX%Q diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_notify_more.png b/packages/SystemUI/res/drawable-xxhdpi/stat_notify_more.png deleted file mode 100644 index 3c33a565af87c2031f21e239110915ab2f545730..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1578 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{$(1uzuN zO$^M949qMHfjkRiCqoxEH)kUka}y(Hm>Jmgy0|!7I2oIp8Tx>#B|!t{FP6_+IDC8xsd%>>#D)oX@Vua$FAYGO%#QAmD%4lD%(WaO9R7iZ)b zC^!e3DQNg6CTHe>1T;Yr1o5v+YEfocYKmJ?ey##Igsn2MxWK^K*~Hb<%-GNn;d3`j zXGdoP16Lzp7$`yYrjQeA`as9%gOUeQa)Ai}(;$cmPy9d*Jo}{P0rN}|Fmt4&ziVY+ zV2bc`aSW-r^=8g~Zy864w&!OQ)fTb&DtqYUtnpds>ToIIn3F(G(!v!BS~VOeX?O^9 z3*_){%2Y&fcKvtMa?O_B$|2UZqN8`w1SgS_+V<$#U(?R-yu0_N{CjSHaP4B^$3N zv>aV!wRk~S(-qO*7SpY-NHXPXXw;uN*y7>QCHRGNk8jt45<#c^l|T077QFlPD{kI4 z-hh{%=A~T_n4!3H(F(`yPj%+wgI#Xl(%y~Fk~)cv+kW7YfG2~8#2YhNAM7u(J%7fJF_djAg=X!AkJ&~$euJB!_F_tUndEApSBaIWP^#`S%JHDIP`g+=jeE&6K zTdZ!y%@BEV{Nwc0YEBg`&JwvP`j-p!9RCP>iD)`vR5#avdlyS*iFkJ@=cDI86(XDF z1Wl;s{G`nEy(YnH!kI<3Vy%{ulbiAm8tmX+ImiCd%cdAl){|>)3m@Ms&^d9r+Y_fd zGgi*8ochNt@n6Qht<&wpy8c%#{1V&Kq|vcZfol;0X)RFjuM|jN2%DL=|J;I*K2YiH M>FVdQ&MBb@07W}N>i_@% diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_device_access_location_found.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_device_access_location_found.png deleted file mode 100644 index 1e5f15fc83729564ff7a6dda668c5b87806d3702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1823 zcmbVNX;2eq7!Jx{B^-hH3vy=T(` z12)-NJ6Yp!I6ILaB*9jO`N3OZ?@U4TAhtN70x24VM50Ey9>)19kqDS5(#WG=2`pE} z@3;nYaJcy@b+8nbinp*8h=wFL>yS(u9fro?I6fwwToD7K#0WS_t>pq^b(a95TFC`M zJ;fBUjt{HUehGRwC?OzNkr1O`DFGjEBFDtW2sAJ%Cz>>|S_9j}1!j2J*xoEA1H>5> zG=>YjbxJA@B=QkGO!OqtJQNfVBr+HzknYJ~fa{4=3P>eWu$$ol(%GI2Hr0zbdjXg= zy)u$5frPWRuoD+hp{R~cCL4`Ll95J2^igDx#bTK`s8kP3!^04-Mdcn1hVK71L#H8^+NGRk}Aul?WKgaPttdK>6Xgnqh zlj@&?cltD?n0@`(>5jtug;7)9QD?tqpUb@+bgO)HY@}b7h}@dsoFr&cgGxdGLgLzj zdC?nfGc7MQhIY*l+e6;(R=%`+-h@=@Nyr;M?2w1^7%F@g(zToh*{N_xIb8o_LwHtG zHNn1mIhuH_tqWvj>$VuPZcxgC$Db_N)M#9J^fHIDEw*^_ zE*NxUjQjBV@Wi5lpiHlfWgejXr}W+GuKcz?7QZ@0K!8x2h~|j&-HIm5{nEn@!`n97 zth@0F*Z%y~`XQH6S$|q*%o-K(wzr!J% z(Ti(Uw><84DE%S6r;-^ukz%TsWX-#8K`nVPa5;ki%sqe7_j&u{J;zip>fO0*Do3Pd z*ATjlQC){f7CS@Ppw6%)0PP8TA zGmg2vMwdjrd=u}US9P4zR&H~=GHJVC&!(;=t2g%c=hbFcgalXt_B*+LA=zyglMl;N z_BrI;6Bg8SNAMR~4vO|p!{1I1S_RpqZZ>#kr(S5gDyioc_SJm6dfxd1qebnFN3t7) zh8VCGIp$kBTJ)$uv-K)LQwn{*T}Gk1(D&_Zb0 z(hR!KRon4|iYbDlbL~h^hs$uOK!i6ilVZ0`e!b9Xm7aPkpH=5PZIf2+j6-Zhy?oM! zzeX&WtF}$}T|5!3qei9eZs_|wwK*)g!8=Wxp?v+++ULo-`&$}FYvN>gm7O+6cq3rd z$|CQR<*d$$cK3TL+WQ@P-nuAo^!b#c_`;f3%02VQl=)Bpeg diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_signal_flightmode.png deleted file mode 100644 index 155c222828c396759cf9a83c6d3625243f907869..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2052 zcmbVNYgiL!7LFt!L~eGY6kOM7C|Av8CKr+bfn3YQ2n0&;(wa#!Kp@G)WO9L3fe3Qh zr7LxHy%ZHe0bAK9_R$JmL9G_03f1lk3(9t(ih#5gx>|R&69spF`1HrlGc(`!ojLD& z-gCb5JyV^&<}E*R2$?`2_$4PvmG~&YAFj6-{@z_wlZg+(m@Eg&L~}7aY(@woEviO< zWCNUsC=pm&w5bP)BM^xBx~v>5N3mLqXN;## zcbuaFI&D1l9gc#jFiDVnT~e_b$t+%zr714d@U_$gArR*f-~|Sp;y0HDvIQKj z0Ez+TE-D_)tj!fDrSiF0_$r>7k6|VOgJHMZ>2?+!HRmxvKA-RAfFK&~L9-MYG1x&f zT0-X;q=-dh)|oIJY6RSjuo|^u@l;&tixdndh2kZ#(K1&kykraqY+`_PCc|KG=k?s% zf+>;z%6O%>C9BAUFqDV|wVE~fe&mMEgYnw^av--Ou11h%*5R81>!qm1YCw!wvNWEG zf1zu2S^*Q};Z=-bGh-komj~i29!m^L<#GumjbTHQd5%|MIUJD7=JFsWTMUAr49D?V zVm=Q7*=#YB%i+yqlZ_S(HfoUhxH>%U92WdVtUzK$U<@^9p{Rbo1Jd(R47KE=CP0$O z1tJx&MrU*zqTCzwB3~(D*4YrP+>9E4=M@&{UZH>|;YehVND4x8nM**nn9b(MAr6lv zf^hXOu-gBpY7ATq!`&YL(=PKSya(OWm(7naULGIBh@TlVemF=E(=!MJ5|k_zWjO{X z_vwWDc(1Iz*z#s-=&Ehr(dz(Wbxq1)XJiw@XG?YBpevvZ$&jk| z2RG#ZZfol*-QtzBKsL?tMwoK_%E%H`en)Q?|Bn_0B^SQz=?1+d9>833U)c)QvK@Q>5~5YpFgPZiIazp z=UYVWr~eSS|EQ;`x%Z*}<^CCYgMNnY93xK;c@0x-!-SaX4Zc@+)N^HOrd}&0cKht` zD(GVMc?e_oM>`FiGrouU)Ae3xy%64CM;3Q;bf;#W5r+aN7qkM2NPWS8*I!aMuY9{; zy+U&0kXV^Fd}zTROShbrRbjmpa1U2=qxLg<$ zNNLeG`bvMeKl(Uhscw~LVUN%CK-X;PLCC;H0CTJX+*e_>Y3mwUQ)sbZ3vnZ2u*k%~q-cZ=nc zE>B9Hk<=4jHRc6JE~ZN zYH3Hj@<<)GGdw<~((^cxfadWyfp*QKsOj*GWzt_6MYR6=c zj5jQDqN?T+bb|W+&RlXW>BuSLCpo@*CTZfmU#wSEynhm;)D(C2IRwn+t8vdRM6H+EWNI1YbAC0d-BjBQ`&}m+2167=KOnP(>5rUY%_1@U7BWPw2SyTkrp*9dc5Gf zW&ifr)n)?=$_s`E@0NBzqOCzPzNhV+-_C<$$1Rd?uk*1L3tMeHuIxVf)4si7{SWrt z8y$!xUzyOV2mA-&v1{k)Ya8`b6#m+k8>31te)Vg<>cG2uwS8~4Upki9c|JrvHJq8# zSS$Zq%MdZa6})*=|Jw2q&odsvp3VzTU8*JZJ(>B$^UlyS+4Ygc5e~K4nN*b?s?qMEOF$;?TzC(ML~^&6e_O z#U;*#WFOvX(yTuEVBOlZ#a{Q1?@CT-Uo?_vuYZqT8eVxPJcKf++H_`j#3GLJ&lwGq z-^_m8)mqq~-}qT?)%K3m$aZz*yMHZ6Z;{@xU;M|vT9-bRxl$`m`ig|szFc|0mA7~I z-yxq^)^4=ty?!ieC!not8h>&Lu6AMLscA_^K5UZA?huzZMmSV<`oy@Y?b$k!>8JAg z#FL(1@A57XeNgpN+~cdDEnu1c@xk#JefFK8Tfzom!*2}FNUsw*zN2ruNuwmX|I5j; KHPSY*%K0;4zZN(E diff --git a/packages/SystemUI/res/drawable/stat_sys_no_sim.xml b/packages/SystemUI/res/drawable/ic_qs_no_sim.xml similarity index 94% rename from packages/SystemUI/res/drawable/stat_sys_no_sim.xml rename to packages/SystemUI/res/drawable/ic_qs_no_sim.xml index 22d1d4b8beac5..bd46012a98f93 100644 --- a/packages/SystemUI/res/drawable/stat_sys_no_sim.xml +++ b/packages/SystemUI/res/drawable/ic_qs_no_sim.xml @@ -14,8 +14,8 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> diff --git a/packages/SystemUI/res/drawable/stat_notify_more.xml b/packages/SystemUI/res/drawable/stat_notify_more.xml new file mode 100644 index 0000000000000..50f12861afe88 --- /dev/null +++ b/packages/SystemUI/res/drawable/stat_notify_more.xml @@ -0,0 +1,24 @@ + + + + diff --git a/packages/SystemUI/res/drawable/stat_sys_airplane_mode.xml b/packages/SystemUI/res/drawable/stat_sys_airplane_mode.xml new file mode 100644 index 0000000000000..433da5f4e4c2e --- /dev/null +++ b/packages/SystemUI/res/drawable/stat_sys_airplane_mode.xml @@ -0,0 +1,28 @@ + + + + + + diff --git a/packages/SystemUI/res/drawable/stat_sys_alarm.xml b/packages/SystemUI/res/drawable/stat_sys_alarm.xml index 3b2bc31ff4c23..57545691b4f6e 100644 --- a/packages/SystemUI/res/drawable/stat_sys_alarm.xml +++ b/packages/SystemUI/res/drawable/stat_sys_alarm.xml @@ -13,13 +13,17 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - + + - - + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/stat_sys_cast.xml b/packages/SystemUI/res/drawable/stat_sys_cast.xml index c9e65e029ed22..df28638c64c83 100644 --- a/packages/SystemUI/res/drawable/stat_sys_cast.xml +++ b/packages/SystemUI/res/drawable/stat_sys_cast.xml @@ -13,13 +13,16 @@ Copyright (C) 2014 The Android Open Source Project See the License for the specific language governing permissions and limitations under the License. --> - + + - - + + + diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth.xml index f53f0e4729dfd..e2d3539376c9e 100644 --- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth.xml +++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth.xml @@ -14,8 +14,8 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected.xml index 2aac4ee03c3c9..94c40babd3467 100644 --- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected.xml +++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected.xml @@ -14,8 +14,8 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_1x.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_1x.xml index 26d263268c7f9..d7463a446657e 100644 --- a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_1x.xml +++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_1x.xml @@ -14,8 +14,8 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + + + + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/stat_sys_ringer_vibrate.xml b/packages/SystemUI/res/drawable/stat_sys_ringer_vibrate.xml index 352d86ff8c66d..f017d58087683 100644 --- a/packages/SystemUI/res/drawable/stat_sys_ringer_vibrate.xml +++ b/packages/SystemUI/res/drawable/stat_sys_ringer_vibrate.xml @@ -13,13 +13,16 @@ Copyright (C) 2014 The Android Open Source Project See the License for the specific language governing permissions and limitations under the License. --> - + + - - + + + \ No newline at end of file diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_0.xml b/packages/SystemUI/res/drawable/stat_sys_signal_0.xml index 67d925932246f..e1e81fd965bf2 100644 --- a/packages/SystemUI/res/drawable/stat_sys_signal_0.xml +++ b/packages/SystemUI/res/drawable/stat_sys_signal_0.xml @@ -15,8 +15,8 @@ Copyright (C) 2014 The Android Open Source Project --> - + + - - + + + diff --git a/packages/SystemUI/res/drawable/stat_sys_zen_none.xml b/packages/SystemUI/res/drawable/stat_sys_zen_none.xml index d8ab078c14a84..7573de0d6e65f 100644 --- a/packages/SystemUI/res/drawable/stat_sys_zen_none.xml +++ b/packages/SystemUI/res/drawable/stat_sys_zen_none.xml @@ -13,13 +13,16 @@ Copyright (C) 2014 The Android Open Source Project See the License for the specific language governing permissions and limitations under the License. --> - + + - - + + + diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml index faa2820aae354..b5f917a4e574b 100644 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml @@ -44,7 +44,7 @@ android:layout_toStartOf="@id/multi_user_switch" android:layout_alignWithParentIfMissing="true" android:layout_marginStart="16dp" - android:paddingEnd="2dp"> + android:paddingEnd="@dimen/system_icons_keyguard_padding_end"> - - + @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:singleLine="true" - android:paddingStart="6dip" + android:paddingStart="7dp" android:gravity="center_vertical|start" /> diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 7ad3a89ce0d18..34e062c062dda 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -60,7 +60,7 @@ android:layout_alignWithParentIfMissing="true" android:layout_marginStart="16dp" android:background="@drawable/ripple_drawable" - android:paddingEnd="2dp" > + android:paddingEnd="4dp" > + android:layout_marginStart="2.5dp"/> + android:layout_height="14.5dp" + android:layout_width="9.5dp" + android:layout_marginStart="7dp"/> \ No newline at end of file diff --git a/packages/SystemUI/res/values-hdpi/dimens.xml b/packages/SystemUI/res/values-hdpi/dimens.xml new file mode 100644 index 0000000000000..799619f46c3eb --- /dev/null +++ b/packages/SystemUI/res/values-hdpi/dimens.xml @@ -0,0 +1,21 @@ + + + + + + 10.5% + diff --git a/packages/SystemUI/res/values-mdpi/dimens.xml b/packages/SystemUI/res/values-mdpi/dimens.xml new file mode 100644 index 0000000000000..7667f3e5b56f6 --- /dev/null +++ b/packages/SystemUI/res/values-mdpi/dimens.xml @@ -0,0 +1,20 @@ + + + + + 12% + diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 9901e444216f3..74a98fc2243f7 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -81,4 +81,7 @@ 80dp 90dp + + + 2dp diff --git a/packages/SystemUI/res/values-tvdpi/dimens.xml b/packages/SystemUI/res/values-tvdpi/dimens.xml new file mode 100644 index 0000000000000..7667f3e5b56f6 --- /dev/null +++ b/packages/SystemUI/res/values-tvdpi/dimens.xml @@ -0,0 +1,20 @@ + + + + + 12% + diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index d3cebd45345c7..122a7289f482e 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -73,6 +73,9 @@ @*android:dimen/status_bar_icon_size + + 14sp + 64dp @@ -86,10 +89,10 @@ 44dp - 18dip + 17dip - 75% + 90% 0dp @@ -405,8 +408,8 @@ 14sp - - 4dp + + 2dp 12dp @@ -419,11 +422,14 @@ 16dp - 8dp + 6dp 6dp + + 4dp + 200dp @@ -461,4 +467,6 @@ 2dp + + 10.5% diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index efd4fb4b47e86..cb66e7a1b1feb 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -69,8 +69,7 @@ diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 5e2f784ec96ca..d24ec66bf7426 100755 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -46,12 +46,13 @@ public class BatteryMeterView extends View implements DemoMode, private static final int FULL = 96; - private static final float SUBPIXEL = 0.4f; // inset rects for softer edges + private static final float SUBPIXEL = 0.33f; // inset rects for softer edges private static final float BOLT_LEVEL_THRESHOLD = 0.3f; // opaque bolt below this fraction private final int[] mColors; boolean mShowPercent = true; + private float mButtonHeightFraction; private final Paint mFramePaint, mBatteryPaint, mWarningTextPaint, mTextPaint, mBoltPaint; private float mTextHeight, mWarningTextHeight; @@ -205,6 +206,8 @@ public class BatteryMeterView extends View implements DemoMode, mWarningString = context.getString(R.string.battery_meter_very_low_overlay_symbol); mCriticalLevel = mContext.getResources().getInteger( com.android.internal.R.integer.config_criticalBatteryWarningLevel); + mButtonHeightFraction = context.getResources().getFraction( + R.fraction.battery_button_height_fraction, 1, 1); mFramePaint = new Paint(Paint.ANTI_ALIAS_FLAG); mFramePaint.setColor(frameColor); @@ -304,7 +307,7 @@ public class BatteryMeterView extends View implements DemoMode, final int height = mHeight - pt - pb; final int width = mWidth - pl - pr; - final int buttonHeight = (int) (height * 0.12f); + final int buttonHeight = (int) (height * mButtonHeightFraction); mFrame.set(0, 0, width, height); mFrame.offset(pl, pt); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index 98adf8140c431..8743207954a5b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -91,7 +91,7 @@ public class CellularTile extends QSTile { if (cb == null) return; final Resources r = mContext.getResources(); - state.iconId = cb.noSim ? R.drawable.stat_sys_no_sim + state.iconId = cb.noSim ? R.drawable.ic_qs_no_sim : !cb.enabled || cb.airplaneModeEnabled ? R.drawable.ic_qs_signal_disabled : cb.mobileSignalIconId > 0 ? cb.mobileSignalIconId : R.drawable.ic_qs_signal_no_signal; @@ -99,7 +99,7 @@ public class CellularTile extends QSTile { state.overlayIconId = cb.enabled && (cb.dataTypeIconId > 0) && !cb.wifiConnected ? cb.dataTypeIconId : 0; - state.filter = state.iconId != R.drawable.stat_sys_no_sim; + state.filter = state.iconId != R.drawable.ic_qs_no_sim; state.activityIn = cb.enabled && cb.activityIn; state.activityOut = cb.enabled && cb.activityOut; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 9da209a3f490a..5883c26e18a51 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -49,7 +49,7 @@ public class SignalClusterView ViewGroup mWifiGroup, mMobileGroup; ImageView mWifi, mMobile, mMobileType, mAirplane; - View mSpacer; + View mWifiAirplaneSpacer; public SignalClusterView(Context context) { this(context, null); @@ -77,8 +77,8 @@ public class SignalClusterView mMobileGroup = (ViewGroup) findViewById(R.id.mobile_combo); mMobile = (ImageView) findViewById(R.id.mobile_signal); mMobileType = (ImageView) findViewById(R.id.mobile_type); - mSpacer = findViewById(R.id.spacer); mAirplane = (ImageView) findViewById(R.id.airplane); + mWifiAirplaneSpacer = findViewById(R.id.wifi_airplane_spacer); apply(); } @@ -90,7 +90,6 @@ public class SignalClusterView mMobileGroup = null; mMobile = null; mMobileType = null; - mSpacer = null; mAirplane = null; super.onDetachedFromWindow(); @@ -198,10 +197,10 @@ public class SignalClusterView mAirplane.setVisibility(View.GONE); } - if (mMobileVisible && mWifiVisible && mIsAirplaneMode) { - mSpacer.setVisibility(View.INVISIBLE); + if (mIsAirplaneMode && mWifiVisible) { + mWifiAirplaneSpacer.setVisibility(View.VISIBLE); } else { - mSpacer.setVisibility(View.GONE); + mWifiAirplaneSpacer.setVisibility(View.GONE); } if (DEBUG) Log.d(TAG, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 3b24bfdd3e65b..4ff066a62174e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -112,6 +112,7 @@ import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.BatteryMeterView; import com.android.systemui.DemoMode; import com.android.systemui.EventLogTags; +import com.android.systemui.FontSizeUtils; import com.android.systemui.R; import com.android.systemui.doze.DozeService; import com.android.systemui.keyguard.KeyguardViewMediator; @@ -1228,11 +1229,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, + " icon=" + icon); StatusBarIconView view = new StatusBarIconView(mContext, slot, null); view.set(icon); - mStatusIcons.addView(view, viewIndex, new LinearLayout.LayoutParams(mIconSize, mIconSize)); + mStatusIcons.addView(view, viewIndex, new LinearLayout.LayoutParams( + LayoutParams.WRAP_CONTENT, mIconSize)); view = new StatusBarIconView(mContext, slot, null); view.set(icon); - mStatusIconsKeyguard.addView(view, viewIndex, - new LinearLayout.LayoutParams(mIconSize, mIconSize)); + mStatusIconsKeyguard.addView(view, viewIndex, new LinearLayout.LayoutParams( + LayoutParams.WRAP_CONTENT, mIconSize)); } public void updateIcon(String slot, int index, int viewIndex, @@ -3057,6 +3059,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, updateDisplaySize(); // populates mDisplayMetrics updateResources(); + updateClockSize(); repositionNavigationBar(); updateExpandedViewPos(EXPANDED_LEAVE_ALONE); updateShowSearchHoldoff(); @@ -3128,6 +3131,13 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } } + private void updateClockSize() { + if (mStatusBarView == null) return; + TextView clock = (TextView) mStatusBarView.findViewById(R.id.clock); + if (clock != null) { + FontSizeUtils.updateFontSize(clock, R.dimen.status_bar_clock_size); + } + } protected void loadDimens() { final Resources res = mContext.getResources(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java index 10f457aec2cc0..d9a3e1459ac9e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java @@ -46,7 +46,8 @@ public class KeyButtonView extends ImageView { private static final String TAG = "StatusBar.KeyButtonView"; private static final boolean DEBUG = false; - public static final float DEFAULT_QUIESCENT_ALPHA = 0.70f; + // TODO: Get rid of this + public static final float DEFAULT_QUIESCENT_ALPHA = 1f; private long mDownTime; private int mCode; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java index d5b2548fc0f0f..61ed095a955ef 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java @@ -42,8 +42,7 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio // The name of the placeholder corresponding to the location request status icon. // This string corresponds to config_statusBarIcons in core/res/res/values/config.xml. public static final String LOCATION_STATUS_ICON_PLACEHOLDER = "location"; - public static final int LOCATION_STATUS_ICON_ID - = R.drawable.stat_sys_device_access_location_found; + public static final int LOCATION_STATUS_ICON_ID = R.drawable.stat_sys_location; private static final int[] mHighPowerRequestAppOpArray = new int[] {AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION}; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 9b59814d13c72..4a6f1a827e71c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -63,7 +63,7 @@ public class NetworkControllerImpl extends BroadcastReceiver static final boolean DEBUG = false; static final boolean CHATTY = false; // additional diagnostics, but not logspew - private static final int FLIGHT_MODE_ICON = R.drawable.stat_sys_signal_flightmode; + private static final int FLIGHT_MODE_ICON = R.drawable.stat_sys_airplane_mode; private static final int ROAMING_ICON = R.drawable.stat_sys_data_fully_connected_roam; // telephony @@ -833,7 +833,7 @@ public class NetworkControllerImpl extends BroadcastReceiver visible = false; } } else { - iconId = R.drawable.stat_sys_no_sim; + iconId = 0; mNoSim = true; visible = false; // no SIM? no data }