From b654846300f79e9e4c605ce62d09f9a05d232fee Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 21 Jul 2014 15:38:06 -0700 Subject: [PATCH] Data Usage, materialized! Asset drop so Data Usage matches new Material spec. Removes time dimension sweeps, so we now summarize the entire visible axis. Fix time axis labels to not draw outside clip bounds. Remove pie chart. No more checkboxes in menus. Telephony items like roaming are moved back to cellular settings. Start wiring up multi-SIM support. Bug: 15760500, 16019700, 16289924, 16303795 Change-Id: Ie8f4821962319bb82ff4bc2f13f1f66ba1bdfe65 --- AndroidManifest.xml | 2 +- res/drawable-hdpi/data_grid_border.9.png | Bin 104 -> 152 bytes res/drawable-hdpi/data_grid_primary.9.png | Bin 122 -> 0 bytes res/drawable-hdpi/data_grid_secondary.9.png | Bin 125 -> 0 bytes .../data_sweep_left_activated.9.png | Bin 1274 -> 0 bytes .../data_sweep_left_default.9.png | Bin 1243 -> 0 bytes .../data_sweep_limit_activated.9.png | Bin 1354 -> 535 bytes .../data_sweep_limit_default.9.png | Bin 1130 -> 0 bytes .../data_sweep_right_activated.9.png | Bin 1535 -> 0 bytes .../data_sweep_right_default.9.png | Bin 1235 -> 0 bytes .../data_sweep_warning_activated.9.png | Bin 1231 -> 526 bytes .../data_sweep_warning_default.9.png | Bin 1195 -> 0 bytes res/drawable-mdpi/data_grid_border.9.png | Bin 151 -> 144 bytes res/drawable-mdpi/data_grid_primary.9.png | Bin 126 -> 0 bytes res/drawable-mdpi/data_grid_secondary.9.png | Bin 125 -> 0 bytes .../data_sweep_left_activated.9.png | Bin 878 -> 0 bytes .../data_sweep_left_default.9.png | Bin 854 -> 0 bytes .../data_sweep_limit_activated.9.png | Bin 895 -> 391 bytes .../data_sweep_limit_default.9.png | Bin 812 -> 0 bytes .../data_sweep_right_activated.9.png | Bin 982 -> 0 bytes .../data_sweep_right_default.9.png | Bin 860 -> 0 bytes .../data_sweep_warning_activated.9.png | Bin 906 -> 384 bytes .../data_sweep_warning_default.9.png | Bin 814 -> 0 bytes res/drawable-xhdpi/data_grid_border.9.png | Bin 168 -> 154 bytes res/drawable-xhdpi/data_grid_primary.9.png | Bin 138 -> 0 bytes res/drawable-xhdpi/data_grid_secondary.9.png | Bin 133 -> 0 bytes .../data_sweep_left_activated.9.png | Bin 1527 -> 0 bytes .../data_sweep_left_default.9.png | Bin 1672 -> 0 bytes .../data_sweep_limit_activated.9.png | Bin 1669 -> 691 bytes .../data_sweep_limit_default.9.png | Bin 1534 -> 0 bytes .../data_sweep_right_activated.9.png | Bin 1852 -> 0 bytes .../data_sweep_right_default.9.png | Bin 1686 -> 0 bytes .../data_sweep_warning_activated.9.png | Bin 1596 -> 694 bytes .../data_sweep_warning_default.9.png | Bin 1610 -> 0 bytes res/drawable-xxhdpi/data_grid_border.9.png | Bin 0 -> 162 bytes .../data_sweep_limit_activated.9.png | Bin 0 -> 983 bytes .../data_sweep_warning_activated.9.png | Bin 0 -> 1008 bytes res/drawable-xxxhdpi/data_grid_border.9.png | Bin 0 -> 1066 bytes .../data_sweep_limit_activated.9.png | Bin 0 -> 1839 bytes .../data_sweep_warning_activated.9.png | Bin 0 -> 1836 bytes res/drawable/data_sweep_limit.xml | 8 +- res/drawable/data_sweep_warning.xml | 8 +- res/layout/app_percentage_item.xml | 18 +- res/layout/data_usage_app_title.xml | 26 +- res/layout/data_usage_chart.xml | 59 +-- .../data_usage_cycle_item.xml} | 20 +- .../data_usage_cycle_item_dropdown.xml} | 19 +- res/layout/data_usage_cycles.xml | 32 +- res/layout/data_usage_detail.xml | 112 +++-- res/layout/data_usage_header.xml | 30 +- res/layout/preference.xml | 19 +- res/menu/data_usage.xml | 27 +- res/values/attrs.xml | 5 +- res/values/dimens.xml | 2 +- res/values/strings.xml | 38 +- res/xml/data_usage_metered_prefs.xml | 10 +- .../android/settings/DataUsageSummary.java | 457 ++++++++++-------- .../net/DataUsageMeteredSettings.java | 6 +- .../settings/widget/ChartDataUsageView.java | 93 +--- .../settings/widget/ChartGridView.java | 90 ++-- .../widget/ChartNetworkSeriesView.java | 42 +- .../settings/widget/ChartSweepView.java | 9 +- .../android/settings/widget/ChartView.java | 9 +- .../android/settings/widget/PieChartView.java | 244 ---------- 64 files changed, 590 insertions(+), 795 deletions(-) delete mode 100644 res/drawable-hdpi/data_grid_primary.9.png delete mode 100644 res/drawable-hdpi/data_grid_secondary.9.png delete mode 100644 res/drawable-hdpi/data_sweep_left_activated.9.png delete mode 100644 res/drawable-hdpi/data_sweep_left_default.9.png delete mode 100644 res/drawable-hdpi/data_sweep_limit_default.9.png delete mode 100644 res/drawable-hdpi/data_sweep_right_activated.9.png delete mode 100644 res/drawable-hdpi/data_sweep_right_default.9.png delete mode 100644 res/drawable-hdpi/data_sweep_warning_default.9.png delete mode 100644 res/drawable-mdpi/data_grid_primary.9.png delete mode 100644 res/drawable-mdpi/data_grid_secondary.9.png delete mode 100644 res/drawable-mdpi/data_sweep_left_activated.9.png delete mode 100644 res/drawable-mdpi/data_sweep_left_default.9.png delete mode 100644 res/drawable-mdpi/data_sweep_limit_default.9.png delete mode 100644 res/drawable-mdpi/data_sweep_right_activated.9.png delete mode 100644 res/drawable-mdpi/data_sweep_right_default.9.png delete mode 100644 res/drawable-mdpi/data_sweep_warning_default.9.png delete mode 100644 res/drawable-xhdpi/data_grid_primary.9.png delete mode 100644 res/drawable-xhdpi/data_grid_secondary.9.png delete mode 100644 res/drawable-xhdpi/data_sweep_left_activated.9.png delete mode 100644 res/drawable-xhdpi/data_sweep_left_default.9.png delete mode 100644 res/drawable-xhdpi/data_sweep_limit_default.9.png delete mode 100644 res/drawable-xhdpi/data_sweep_right_activated.9.png delete mode 100644 res/drawable-xhdpi/data_sweep_right_default.9.png delete mode 100644 res/drawable-xhdpi/data_sweep_warning_default.9.png create mode 100644 res/drawable-xxhdpi/data_grid_border.9.png create mode 100644 res/drawable-xxhdpi/data_sweep_limit_activated.9.png create mode 100644 res/drawable-xxhdpi/data_sweep_warning_activated.9.png create mode 100644 res/drawable-xxxhdpi/data_grid_border.9.png create mode 100644 res/drawable-xxxhdpi/data_sweep_limit_activated.9.png create mode 100644 res/drawable-xxxhdpi/data_sweep_warning_activated.9.png rename res/{drawable/data_sweep_right.xml => layout/data_usage_cycle_item.xml} (53%) rename res/{drawable/data_sweep_left.xml => layout/data_usage_cycle_item_dropdown.xml} (52%) delete mode 100644 src/com/android/settings/widget/PieChartView.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 37adc02348c..8369672be6a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1659,7 +1659,7 @@ diff --git a/res/drawable-hdpi/data_grid_border.9.png b/res/drawable-hdpi/data_grid_border.9.png index a857faeb38d72e575970eba1b210647485c3d515..8d22e1015faa7991f9c4117fdb4932d5d5b64b08 100644 GIT binary patch delta 122 zcmd0p!8k#sgr(TYGlT;OYB*9l7#J8h3p^r=85p=bL736}oKF@)oK@{j-j?U^~489RRPr#46O9E+a+&;1xrK*OQNP5&QHJCH7N e$76?}!%+qvS?lsxH4nJ zaCd?*qxs3xYk`9Do-U3d95a1SDl#${@UU$BVfp{pzLW$F1+5#GS0(@j3-+{b6$ Q2vo}8>FVdQ&MBb@06BCY$p8QV diff --git a/res/drawable-hdpi/data_sweep_left_activated.9.png b/res/drawable-hdpi/data_sweep_left_activated.9.png deleted file mode 100644 index 7a18e204bde8bdb1def978675185846f21f731f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1274 zcmVG4%gSJW2XC*OBbLSWE9tempYBa)^5CZz@7cghz3(6O;z8D|;20qjnebEqU>{X~> za>(xO^g*C_tSflK;wAe}NXWqM{Fq^xWp{?a`p~B5q@4}gdK1e~N*i?&La5n$dzH@{ z<;Arm2SAyhpZ|tZ3PK3BwzmESPynEtZD=J@0PtP0Sp2hIAj|SE0ImS2CfiZI+p?wz z0Qv!Vn#%fXyz|4UrkHC_}EBRv5~A|BU!~pvWksl6&uMaHj-6rB&*m+R}($ZDV0jiguW~&{CukFr7|MUtV6C0xd(%&CN9q zl1_n^Ag8CN8wbgAfSn+p^qw!?iX#`9p5^t>rK8iE~uB@!Qjm2V?0|A3y`jL?l=(-M`=MfAB8^Cxx zzUlFJ23Z1SS$+fH7(fw^4}YyA&c($Aa=9G5UazaU1tm#h3hX2;v;JbS82bDB`Sta6 zcOsGaEgp}*mn3OW)3hqbah3xCgYK@)5_S6h{-5^t_WqD%dAM6GI6OT325oe=(fmmQ zfcN=)gQZeQxxKyB(c6m%qy@RVy9)q9xm*^j)he7$C((5sz5FZM(n2RECjh`vN(EAr z_4>bZ3$jwF5CDWy%2E0FMpw%}vqg z^L>AJcURvj3m_FmQMkIg`nz3Z%h~qX*%|zPzj%Fp?NU{>;`Mrebh%uD#wfb3>*wd^ ze`PY6_s7S_CjdSGFg>d=Y8?VVB!mo6O8tT${Gcexx3v%SrL9Q;d@2+QA5>L62XKM= zHDY%#Y0;KS2_Yba@Vc(|Ns{!sQmG86s_Mr5S}qnyRS<-aZnyiUR4V-g;3FO`$$A>u zRL%o%3WDI~I8H$At5ILh*OBbuHlK7|ud1qA!F@Mtc;b6$RvW?pOQu*ZE~2LXN k1IG@t^k5jI=&+mr1Ecum{YO{C+W-In07*qoM6N<$f{chvW&i*H diff --git a/res/drawable-hdpi/data_sweep_left_default.9.png b/res/drawable-hdpi/data_sweep_left_default.9.png deleted file mode 100644 index 50881507abafd80fe4004f14af580af977f4ca10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1243 zcmeAS@N?(olHy`uVBq!ia0vp^nm`=S!3HEtrQc}*DVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9s&LwVp1HAsLNtXWRQohszw_zrXzb&7FtyW-nMaLnY6ECqQYZbNiC1 zyGl;5Bqg5|($w%?<`WyBuC~M^dHWWX;I9M_0dHdVl z@oYSsR(h}bGWYh1_sX`B-)qX>7w@lrpZ8O4hNNv<^sU+DX>6{qFBe`|Y}mQtx#+95 z$F46|dF)-YgrVTsudlD=4U9WDzQ4Px%~-*z@MhuhP7Q|V%?c;v%^04~{;Ph_sA{{i zNQ0fC%ciC4*WZk{e|aFzGpKkCOM{zt{i2)x7KvL=KbyaI#%!^M9~(D5I{QypFi^6z z!Kz37f@@=y=Fe*-rK<(2I_cS_C&f^%t`uN%!gv%I}=*VU_6(_0sP)=Wh!;J=jn=FZ^q5eSJp8i`P4M?##Y@`}V7EZ*Q-16>xBA-1Y43l<9i0 zzfyo;*~N@23=SL@r+EuIMVyggbG#rSFTa1Pk6Qh%;^*hA`j#>%uYB_8(IVCcbv3np zlY;6b+7f#^tomGClsKCHR@lq~f`38``8hdT-mZ?FG;`yoO-YOvrWO_z7dPpY2X%UcRA!Dj1GUVWmMRx{A`1qMZT_H9tN)4B8oU zZ(`7~Lk4do^!N@NObI&n`RAW!lhys}m>qV;tn>ZUt9fDj!l0EG4jgFEn(B3Flg`Am zY3n^S4=ZpmZE;bYY1wl$$?*R7jT<(6xclnWtM$yx%=Pbpk+oRWPP$V?aN_G-GX2N> z_f~vdq_H%Iho8Uy>({TUOQxu_C@h^aC1{?OSa&tQoXwAaA0HpLx9Zy*tTi?6p~ClS z70Hv*%PrYejn#8*?|V^s@8`#lAJ40)tMB(%8YHhi*>ib}UikKH+sx!_tG;|bJzal# z?(KhfKkxBXT4hwc_-##~hnXv@@o@$fnd6?7^U9~qJkMaUcuLUMs=aIr99-7t+`d;D zTh4w!PVnlF8_J5WR;*zVU{0{^`#dk`)!(eGQrt}rKp(m&J^Z~d{#)&SrUS3Ey221a&3`m?C+nB(dW>-X1Y{AJ}6bMMfzuQrt6VQW5^@MHc* dy_%_iq_oZ-^v@M*<_4Bd44$rjF6*2UngDeEONIad diff --git a/res/drawable-hdpi/data_sweep_limit_activated.9.png b/res/drawable-hdpi/data_sweep_limit_activated.9.png index 36be41aaba1f20764d25867b894bab852c995774..598ebd3d8e6e4de80a0a14243f429b0df5ddd854 100644 GIT binary patch delta 508 zcmVSiBL{Q4GJ0x0000DNk~Le0000r0000N2nGNE0IPxrO_3ode*w8k zL_t(oh27Y{ZWBQe2Jqh{S7GxC2ti;5g`O+Q50=!S}%6R z=*6w(-)&692f2sW$=<;L7x;^BfB2Yefh|QXJiF>b0AS_E0KAPf0bf*c22$1 z?c%A$6uOKY_e9(+ds8a!x(CTtvscfJN+kD+{%UHR>~6AMkCq(&kbX$z1O~XBes|3y z$KSn@mFFp94LuME6_})Ed97Z* y3-J|uk4NH!{7d8zsK=TtdzY_9y?y7n3jY8S@m|B3Uz`vC0000lL*X2OQ@R+q96=0Fvu$< zO0g@+C`<1`FDi*Jya}WbBfSWsi%M4zEy;FW&p7Lh<9zIVo%41vGqNdB?uRq(oF5$K zJ#)^y=b8U`-sgFEAL0L_rj6x3e}3oT;o;%o;o;#?mv|-PG&;j!t|bzvqepQw8PP;Q z(`G)QQYhC&+S-(C-wuxrSuFQDO z-v$S1Hw<(U&LorC^V_z$Y}&-SkrBR6COz>1IxLH8yLYqs_;LC6!iCWCf4)9z)!<-Q z0j}%LN+Vs<_$3z0jGj4j+b@#OE0wKWt9$X=Op|ynM-EtFS&bL6*@lzD!=LoH?sGU! z29a6B9h8Vj*0K_3r>6GqIDh_|z1`iZeOIp*q0Yr`G7JphMxnst4Gp26rlyQf2L|3* z5sB;!#bQ|vW+OZR3S7Twe_E5l;H4*S-h5UCgMVHHr#qEW`W*a+hZm(#j>Edf#zm)Z z-`4i`_rKB`kH6)_Vi^nrz@6G`dOf5C7lM5|@#$0jBk zp6>4M+vvIneYPFUE0yt!_~zlUqQC&OV)=_%$FzryC8kNVP+)CWmzvd?d|&(MYMS%~gT^u2Hec=OS+h2m+plaJ7hI{5 z6E1kqZ}Iy%JTSmxO-;UIw!LU&M@RRIA_q;|ZY{cQu3Eywe*zc3%`})<#5tT}Wj^auEl^z^*l8jWtqrPEbOuy?ay z#TOu5Eb?S16!wTVv=g=+=xA>4eBI~!xM6&}D_<<8=5y;{CQKLK1j3YFfL8vjeqg*mL=)j$Jgx!S zfh9}!EFK?Uoy%sEwUA)%MhBD{8q#ERRJ{}kta_uPf8%Sv->)lGW0u}0%5lh#jj4Px zIVDh4;Z&UV$>fe;rc4 zm-@GoEML9hGtDlHGJUl!+ sJn9KiN+I%(!p6(SCFZr-Q%dnSfh5WS!C&o+3;+NC07*qoM6N<$f;O0x;Q#;t diff --git a/res/drawable-hdpi/data_sweep_limit_default.9.png b/res/drawable-hdpi/data_sweep_limit_default.9.png deleted file mode 100644 index 658d1d9cb5af937cb1262be461ebcaca578bc62f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1130 zcmV-w1eN=VP)}I#y z-K1$#ZBm;+HMCGD1WKw%K}E!P@Zdq{K|FdY(t}bFPZq4;MZAdKiWjvY#bPg2Y>l;u z*lJ5#`wwYSOS&=1W;3(%=XsbdP1BZGcB}2?_km?*VRn9R-tV_>-oOa|p3d8syZD`D zS(as4mStI%Wm%SGS(as4mStI%Wmyjb*L8VibdR1^+0yZs>?LCuB;mPonGeRtn~q^g zCf^mI*LCS%xzZdO8!Ha1S=0H^z`)LRQ&ZcycCBQ5A9WlkmBQ)n?qgpj$veA`9{p)^ zu^9X@Gvg;B%&IOvkaa7Obj=l@h%t|RyJ^$cXIHP*QzHIJk=fsknK>y^Jqfilg@PU* z9GrY>{rVSxywio?(gafMkke#a6 z^VM_ba3N7hXyY;@q!(B+1{`Pc!&OOCyMSdUlH}Uw^?K7WxB%~p2&yK84rwfbwyZbv z$b#)66d-KWdI9GNbNfHa-EaZfr7D2_0#}|_-43h(I+{NFeM&$S#Dmg4ksaMo4k3~| z%!L3Ea9s5?5QLx)HNWy@e%n+B#v9uT;L)aKM}ZE=&cX7-aQIPp5vVJeg%glKoP+#% z)r;@N@ecsMB}qgJ8j|bDS0DtYfB={P9NIMb00Cqi=-HhlUu-a@Z>z{q1VIe(^_!gm z$wU4sRNs%|PZTb9L-lHUyJ)&H%Yyy+ZD!jhzQN5vDTMwGSpT-;y!^B=TbDuJ0~3MP zAv~jcVNV=?_M_@(0nX3Dn1J7CNSe~_3BDr(CV^}QRv1_pKu^EOhNnaZ2Sv&i2)ZOeA34!M9Lz>AM|v-eX+gP}Ke(0V!69ux9MTC<(qzY^ wou<;_#~+*go82xS_w0G|KOO7=bI%v%Kgv*Upm2U0AOHXW07*qoM6N<$g5$y*%m4rY diff --git a/res/drawable-hdpi/data_sweep_right_activated.9.png b/res/drawable-hdpi/data_sweep_right_activated.9.png deleted file mode 100644 index 96ffbf6cccc6a8dfb219401b81bc20a7f5bc9629..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1535 zcmVA&{y9`ZN?ZR_w}N-^tVmH*)Ph!6XhiL&f|LLRHBI|7U*Pxq ze*!QCAYCn3K}fVvNdn*jpca&Qa^)+5#9~O6t0M!*6qL)ka)yOxeN`gn8u{9=I{-L~ z>Ns=dD-yv%9ag5EfE7H$tsrZj744Bq^S|lIx{rjl>Y$UJPNM5m#ykaAH#YXbVw~KVSTnqq-qLuHemY<4{x~}ViK){*F zWT>gB35|`7yj=^jWF%t@r%s(}jm2W(_U+qcB7!K2ShsFnHGI}g00IDh)-)}Xe@#qG z%v`^Iy$^u8fB$|t6bixX^`fPvr5c7szZNWujK||NH8nLeI5>C^fVywrJ~)D1nK8yOxV`Sr_vhH0^e~ zmCnx2n*##_d!x~)qqViwqbLdzi3HZHSyNkNF|@0z>*m0~z@BI{>e#$_vqw=BeEISP zt5>hCEwT{m@pzQ3uCAL`uU_5t;K2jOmMvR6s;VNHOfCz`?cQAgRlB>phpt??vMUma z2%9!-@+gXe+1c5OpfrzcY7?x>Z%hhYugn-rinYWHGe2w|Ds5xpO=3 z-@or@Yio0Ryh}43c=+%kIyyRP zi!6l7vh45c>$}z8-@oJT-MjNW`s~>=bar-@-*&Oj2H*$qqo!$3d0>gi6h%==BoeXV z;o)D;oH_HPySqE{^5x52H@>USqjoVa!R^ywYXpFek>Jb6-l{P=Nc+l$$d8}9M( z@uyaI$ZCklkR+)=)3ov3yLayy9UUDZBAu}XEbGHPF)_j02xLdnG)*(m+}ylsbaeDD zWPdoi;Fs8zk%nRL27-tn2m;e}9f?H32|#-E=uxt`UQHjfjpP*@$tyOJSLzN)RQfn_Dafj> z7Rlop8X8LeW(7$AC^re_oKC0k@#9BrWMpIp0N%WLQ&MlSH8l*`6-^2_I{vLRBm!tuRdrP|ne?X9=|*IGmj^N}NmA0~a!n@^iO+%{%o0(i_zbtwP=1|Q zgCt2VK@b{{J52IR1eYXRxQ$_&W;&ftCjsclu0t!iidb!d;ooIgJQo@fvTGmB-21v* lS^5p7+->N;s-i|i@(9s&LrJgR1AsLNtXWRQohszw_zrXzb&7FtyyaR%Lgv>1@og9nW`Ib!G zRdPb)$gxSPK>^czX6|yCJ7a=IviYqEn$9lMcruS(TI<9b)5*#qw3JE9`k!)f`Hg+Q zOAiF}XcXQm&s)5&|4Yi<%je7ISAV~E_fu^`+7?dvY}w|Sj`;yKA>J;sqPf#2n_vER z*0u2CWdVkB_jeXQw@qUcOiW8##_~Y4!60hyw?GCxR>ukUIShKHzpWWhn{|ma=qb8< ziii*2ykD;K8fTok=h;~-4aYYAbJ;xqLgQ7v+2WSjc~K0H)UzI){nw{(YsJFgS1eXL z4&9#k=laVR9e-l)&6@bPJ!aUU(DGx-%)5u#9;3QTt^WQxL~HBzy?ggApW?K4o$bD3y2Y1DV|)7gj&Zj(&6+oF-~H>?%g>kI zwLSm&TZ@22&b;TLwfFD8fB*h}QBu;QZ{NOctNQSuvCBc=K&M0O=fYD97cT5y7rWc+ zUWQ2)gF;Kj$)%i%I%#~(3K=|neE0m-Cfob?`mR-8B$9C2P&qqhO-@JP##1Ojr>McQ=4JmE!e=|ActMkCn-T(g0n>Wf$KXSTN1Sh`UCDVWWyso~!_|hr8 ztHamxm6VpME}5dzqOf$zl%RRqV%^pK^7j9}-Q1jh-@0#eu-4SLhYH_U$8JhJXZn0W z%CnZ-+u=6ncbiyP{5W~y#EJBkA+HXn7`>cw`su4{*RCDAyxhOO=I5uUlX7qGubQ{r z((utj5O~RAi2OR?aJLoOzzvV*Qk$uT^{57C5-9&$)fCG`5`mfSlmf zAG~Hkf0R$EF*)!wytO!I?X|Le_0=pL4kpE=Ji?tV?|;|b{Qj4VL7qK+)`?5M)AuHE zuos)Txt!Xhb5-W40Y{US@%6rwuDkXwxVxACczt8@QNcxrZ^!YlH6KhckocFrhj;g+ b{|vJq9`s+VSmX>Wl^8r-{an^LB{Ts5l-NR; diff --git a/res/drawable-hdpi/data_sweep_warning_activated.9.png b/res/drawable-hdpi/data_sweep_warning_activated.9.png index 83b8a6566426788db321f4814a93b9075049a935..b10dff606a4227a1be845676da25f9ae17a924b0 100644 GIT binary patch delta 499 zcmVo^LA_>K>F zfgP#-3S$^-Z$jHERNyRF!9_g6e|x;cd5KWf4O}ErBm#{@;s!qArqm|AJmac^vi}!W z*Vd~j;w*lKZD*_{=iSFk)PwEKX3>;72+wdqQgPv?-!v+T$QeA%&P68$b=d2;!g7!z zsny3lmWNbcWG=Hjq%x0l-Iry-3S~)+u=|h4+@%bud`KSRM?8<`95d&Cf1{jI{jh_u z^WFw>{tg95<&$*0ZiKD(k3KSLX<2_o0a9`3Y~tSoY)MPZ}B$b-{=ssPtu8Ds<$$+uegP)c#bbpzqL}|d=CFL p+>ZF)2r-$H^XwBRetSL)zX0%6X%xQ#X`TQ8002ovPDHLkV1m0==b8Wj delta 1210 zcmV;r1V#If1kVW}iBL{Q4GJ0x0000DNk~Le0001A0000f2nGNE08=;hDUl&3e*|$! zL_t(&f$f@4j1yHH$3MR})9G~ou+oKqe*#KOh~6~uKs>1jZyv-%Nl5Udi5ER62NOJ* zX!N2NVh|5YB8Etek?h950TL7uO)!c?;}W2-Tio5&mfcP}oxY!kX{8bpUCT1r?R=8y zo3?Le-h6+*_j|v2Z-oDjcJ0d|e~wE@Nl8gbNl8gbNx8XPo3E$&`_j_=tn?4D9Uu>w z_9oX>PFWNk{W@CO->LIPzy33IO`2K zz4%|}SdnUT;PS+e^_RE3ero)U9UJVnk+y1c!6;x@h%K94~zGG;YffGB&%JbFTL$d0*d0c=a1p(9vB64a(aC*IsWsD{E zc*ltYagXAQBDA8$uqo#s*d+NAXRlm1IcZuD+g2VrpaRITOOyxR)*ZyLKiAu3lR*H- z;6xS+b&FW?3tGrH&6|zB@+*h}%^m1g6?$3Gi5k;wxYk z2N>Bt&VfxMti5kNcZW@a#T(#;wo6(zcJ_`j-K+o61S-Vh&k}dKWhXv>RZPxhD2S+R zpJ30#H;!%2v+k8G>@bFg)nq+O+80l< z3oa#Um6izgxqwS~pW>_Ea%lea1EjfO(6D#_;d}xGXcd>pW@!1 z_;U9tJ_3A6#b0t%l}I2cH@J99mg0*?Ir#DK9B~~6HG%lwe^25=?BS7BYPE=h?=Zdf z6UI(Xb2^hDce4lJeiOfw0fk|Us^?Gu&TSiK&)G7UJr{2&4RCF2>pSt`Y6esdDUIg1 zIQb{1UpUO(a-D`}aCHeXAdR0p0I=<{FU5zyGoZ#?z|5K)(}yPc=Cu>-Z&(~7pvny~ zK}T;R7|)Goe>J@JdP(1kPge#s8!(;sx%}oyCdPhd+z10=5Df8WZ<~<8FV(1>nbHOz z3ys(&?!Po}rK2cKfm)?OVK__X*{}HE&f8h@$U410v=WH+HV0<}W=d4v`oivODb;&! z72Y`-4=c-d+W1ByU=%#puv(S7vMw9e46|M#quNt+e^4W|N(+?c8=Mp2yed;b1JG3b zHb!u)lJy)$jF7KK3<5sAIj91WV+e+_R4M_pMyL^|yQ$}QAtD%6JkP;*9kT7^$euJ3 z!KxD0o7B0wSY_$;#4C`_3ZCiO?^UDDOH-ZKancvjQc_YiaK&>%e!h;%&1_i^DMn&W02_exZHO62xJm`xi>VuIW8bPC?a!Zs4#VCf< z*aT|~qH@tH-ICJFw%fhT&Kw`Mn596#bd6;D|0I){O?G$A{`Sm&{{M_{;k4vf{>A4E z!!V4~B@%JguYaC&Iz;tbQQcyxeqs5(&(576)7aSXf0tN!mR((s>gTAglQqj4UBChG z?0?>3-`-IZ9sBea(XQp(w79OU=by4S&Ly)w+FM*srfvI3a@hO%xaU0i$c^nQI=t&! z>U2imhz#vL=pT6c)$Y#5crrJyr8ei;zW?VyfnR!aWvO9GhVMm$mgzRFmri%~be%}t zvGj`OR~~A5X3n&MRd#+bA>>qvNEoTj_h#$&zO;Mfx!1RKAH40F`fN{fAb%nSCr9=C zCo;}d6L(R)M}X?ZbL+3_-L$wQ;RNu5lihDBpZjGLNr|sxtD_fTW)82mK zN~>ITOziwAaV0Eha#%7i9{q4%s`|i-vtMp+9$u}Pp%JlM2aw{DrWl2WzAs*)`dF&r z>(+J09-LKY^&cM$)8(k6G;9Z`1FZ2)IDKJNF%nVBO6NkobJ2_iAFSn*M0C(2l#sJF zp8!GVOSSvLuJF+f+f&1v=Jh?VCQ7av=YKw)mJ&g@!mJzkT* zRYlMBKZs!EeG2b?7ajtv?!R=><2@iw$%{PDJH8(PTq<RQ>e39(ZeC_(R-<&ck6j!sk@@3i!Y<#A**OP?j=LuJz4U+Dp# zlWk!KA)XhZL6ysM1!i`%$ilnYWqw<;R3GivvCn?gV_zN8ZpY%dWAjJWCus?pP$`t7 zhAA69AeLZ(BrI002ov JPDHLkV1jDsNoW87 diff --git a/res/drawable-mdpi/data_grid_border.9.png b/res/drawable-mdpi/data_grid_border.9.png index 699c513a5c2807dc5d06ab1c690bb1b0c0ad3306..942f4ea10c87886ff7f53f530dfccc4bec9ed74f 100644 GIT binary patch delta 78 zcmbQvIDv73r@N7-i(?4K%;X>c|JyT*{Ao|(P~X0Q<6L4w!jJPu8dwdC3=9kuR?o3n i$gk9qBgV|ktjw@Up3l2mndbrn5O})!xvXHbH-d)00000NkvXXu0mjfqX8nD diff --git a/res/drawable-mdpi/data_grid_primary.9.png b/res/drawable-mdpi/data_grid_primary.9.png deleted file mode 100644 index 83411cf725a335b36b066a44e361c167688f5e45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~EX7WqAsj$Z!;#Vf4nJ zaCd?*qxs3xYk`6ao-U3d95a)D{Qqyy%*=eao=xLN{+_Qd>qQ#>|Nn2y!0=@`&*8(l SAN7E089ZJ6T-G@yGywq3IwRZw diff --git a/res/drawable-mdpi/data_grid_secondary.9.png b/res/drawable-mdpi/data_grid_secondary.9.png deleted file mode 100644 index 23330d1770a433be77b00c53bb27e5a626fdf0a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~EX7WqAsj$Z!;#Vf4nJ zaCd?*qxs3xYk`9Do-U3d95a1SDl#${@UU$BVfp{pzLW$F1+5#GS0(@j3-+{b6$ Q2vo}8>FVdQ&MBb@06BCY$p8QV diff --git a/res/drawable-mdpi/data_sweep_left_activated.9.png b/res/drawable-mdpi/data_sweep_left_activated.9.png deleted file mode 100644 index 10c0687573da1660de40f7a3f19f48235c30873f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 878 zcmV-!1CjiRP)1p zhNMmOVjB&#Cf-eI4Og$~8n1o>fs~0at#jLDH2@8QWSXr322Sovq zKe9HO?33(a!|?tx!!kQN3wRs8Jzh@8!&^c zZ8+c&CIAddDc|0n4+2O7P>l@(xcQNL9a;j=&&-wE^Zv(biXNd_u(pY)1>|V{cvN4^Ugf&*|Cb*wk?<$>+9>Yr>Cb!&jMC4$8iKR!!V4fWm(6L# z-rgQ9E-tbV;@#%v=C^@?f$4lce@#SQ?N$M(8PZrRhFC0yg@uLpj^lhN7K;j9_N;?Y z?N!P|gnT~#rc^2^W~NG|0;N>fN2@gZA4(z;LqClBFYC}4EXGOr;W1+6A}16 zAfk>JKGn&;RqA@k%y3<|BBhjpKtM<-MK=iq0#XPe(c;ct*TapC4RLsQm_9f-_%$;# z^OcBP+zd0dD026iQc5HeiQl-Hw41iC>%Wwelu{$iJQWUyKlb(Y^(&=7olQAhDwVD- zE-sP)jsawvp$`fLgF#K#^}%#H9R#3t0M*7F8ymYyr_%)hZnFlB_d^g7hKGm6 zNsNq)z_xA5<#Io-o2H4Op&{z%=)ls_61KOuYtdY?v9SRFU}kD)Xb_=LsGFH9%v{kl z?Qv^stH#U(0K2=p*US7xQR#FV%#1>zAOMI=CNsRcy1J3i=PUVqzOu5i@@Z;n>KOpq z+1U{QkV>ThfPDoDL55%old_ILRgODl%hNg}ETz==eH0H0mDu&@AT zMqgiFqOPtk<#}FJ2qBpn%nTuf^gQo891eHK$)D@ z`3|mQO4oJy;iz3 zt*tF@eSIB(&)6#xiQxG77%eR=;k~`Rw%*>}=cA*eFJrM-oS9K97QZYmF23K~-24!W z#lG6MT{TS;)oRs`?q-(&L}O!PMA!9B08gcqucef)06dXWK8i-8bpR-k=-D()%+AgN zfJi2j;kLH6heQ+;Ld4qJ+oOp@!UQ13#>QY6M(x78ghCgp1yR7yxG2>?1fJA)S~ g6pH_lfBie}2Ur*v(p=+#)c^nh07*qoM6N<$g1`}s0{{R3 diff --git a/res/drawable-mdpi/data_sweep_limit_activated.9.png b/res/drawable-mdpi/data_sweep_limit_activated.9.png index 924384ffb6953c652d71550db36f3fb6a32c01bc..f2be5eab4ba17c32ab7bd18bee5d19c6766c5ecc 100644 GIT binary patch delta 363 zcmV-x0hIp#28RP7iBL{Q4GJ0x0000DNk~Le0000a0000G2nGNE0DkM;BatB|e*q~; zL_t(YiOtqMP6IIzhT+Fa>WG4tpPYs!4J8r{6&(c~mp~wnfS^YT+#?qN1v)w;%4|%r zwi1O6WW%n+C#_Z~j&`aMSf7!;#r$}S;nj%<;PKG(gtup-u-xgn>kNebjr^4y4 z>X@hLCfQ~Qa&a4kWSgb-l`?9r0KqA?FijJ$QjX@fGKGx;P1FBi3GgRnpJCHLIVFAU zEZNo>x8F2SR@Y{SCDIO1-J+WPC$s}px2Wcm_DDNGbrh8;e#bTc0|+kgK|;Ct;?f<| zq*kRbroIoH;6W;?ja?lzG{qa9l$Yysf}1g4!MZ17qgOy3eE|&RJI*VPI9&h$002ov JPDHLkV1o12m=gd1 delta 871 zcmV-t1DO1W1OEmgiBL{Q4GJ0x0000DNk~Le0000$0000S2nGNE0MRA6QjsAie*+;& zL_t(oh3%L@XcSi%$A90<#AJxuCb~fnS=*R&QY1o!Boa}ymr4l;7J6x+Qm9%QP!ED& zdn)On2pSYcZ@u)W=jJ355Lt3-NkPoX-I%bG&6?Tnn#|7odf2t37ZY`t-Ie{pgPDQH z_kI62-=Fs$yc(^H7A;!5n@GJAe|S^A^*lM**GHsVvnTGW5q<`t~Xe^yde)pDGU zaofK88Jq(GXc7U=#p7J}eRO5TmQ;#c{rwkv78k!W`TUxce~hhcRupK9Z`*cq%(kyg zyYAe3`F!IGFgHBRzS&uHWW*wwjDGRFuRqFUelq!dk+wF&)_qI?q9|HlGo~|EX&tLZ zc~^~nv$GTr9kNI!&6&Z$eUsE9$;LRDUCh}b2t>FEKQK!B&mkBj^8p^o=GcZ?60E&c(&g!!Qg4oT{A8q--4x*8+EXd$}J3e`q{z$J1$ZZD8Ps zJ-$CtDi;3{k*Y6PLkXZaZ*n%3qHy@I#oSzU+4D{eWwVne2wnif7Pq~xL&FH*h#(Ua zEFC>6?#zt&!t)LsdH(!{mCd#rh^W!FysiGGyuiVPIwjHBt zq)tMpD&fL{me$vc)hu2q7bIYZ0EGg8mII_xA#(h>@)b-o9zh4KPKVEv_<{9845 zdtt%a7|Q|r01wzfeZ4^{@oS;O8juG51eO7P8N>oypd09@JyGy_qdzJRYd-4`)2EnxAH4h$Hx*n7Lg>PUx>3-TD7pwDLjQmZ zsfCnU(rGBzlv2jO(O?rNFYg`~nTke~#7>xLc^`PZ3y*g=_uTXTaN*^wa>Qb>SS%Kc z#bUA8|4O3P2`t5%9Ua`9p5~Kv>-1$luXlQT^~1e;{9P{BI<@7OtDJ5Beno|XY;X`8 z9>%tB*WDvW1Yjd0OOETRndEXg)!NE$LqmMGaii4JW64Y=wX?tfjiIYovl<xItFwE(tj*OFpCU9k+%P`$LP zqd`(=<}ID>xROd;TzUU~E_CjpqyR9Rn+ubTjV(VmH-EL|_U*m4d9&&AH00^IZOZ2^&40%)@J>-o4?Ty*{cAkF^|{PjM32DDR0 zUkCAIHCisg7j3X|8Xmbyjs}r{aTo(0a^r?O@4bIvzy;xh%D@9RfijR{K6qVpfq_Y_w0BQMtUN0@U4P7jnQy&T-EBL_4%jLbr!CT~gPK+3XZd zG{Hm$N_XcMu`W8dsv3Z%`C;NMDboR6K#zm&eyKetH3Hh^T>Y=;s}e9E0VpfEO;WHy qN(7ZIep|0L^@Vr+*V^Y_FZg2=TIX2ZhJ7{w0000kA_jMIXS z#2(huP`j|~O7*s$JPG0+ytD-mozs+Lq$EdhAulTQjYF>nA+1VMOOJAVQo55W0aVhEp-!ux0$fX75+*UlgROP_m* zH@VI{Htr|T7e}1{|5F9P02lxRU;qq&0Wbgtz=r}xA`#z8$!4X#OPq6Se0-es_xB@{ z$>8wt&@aAgAcMtX(JB^;*5u^m7=Q>7F#uRyUA?d0rtg|A;OXhm58A0ItPID z_4S7XYMMs5T<-69JU$EnrfG5jSX*0r7+|4LsFurR%H?wJ7Zw(V0l=~>4ggzQTmAzZ zp=W1j@8{>|hXJ5kt#Sa^+}!jZ=!MSB%?$y7VHg|$wzs$a2YR5#v$L}=0pRxbwq0oF zKo9h%@9OGu4h{}5G&JNNun{WD@<1w;N;{78S`@{% zx~_9k6rGck6DW$}y63BR3&xmWnx@g)+xuc^X(>HDJ^f2G8g(>HaT%v^YOM@014s0szOh z?SawJ(I0kqcRw`PSWBSebpC0Lh`>2#hG96RQt1(64AhW0zSlI2v3le96s=3&W)T$t z|Mx)G;&Rt+K|}<`+Aq9`2vk$;KG*8q3P_xD!8>u=kst_M5Cp+AO}pLQf&f^1dwaiY znr7&_UahspV{fb5K95ZhRWLf5l zqA=4mS-T6lAP5MD!*qOnOoc+h=``v5*BuGy`|rGe0M0xqo2e_TqW}N^07*qoM6N<$ Eg7t{WqW}N^ diff --git a/res/drawable-mdpi/data_sweep_right_default.9.png b/res/drawable-mdpi/data_sweep_right_default.9.png deleted file mode 100644 index 5b8e10843ac25a272090655179169de2452fe121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 860 zcmV-i1Ec(jP)>T*)h9NIv*IA=XqwH*Zg?q@*PBkcSP>DmgHZo4-@r{vFP&h zavUI=&0Yev4}CFD8;!M1*3or~#eLW~X*`cJ>Q}Lak6J)V8;`e_32y{1Q;d z$Hy8Volg4#6*S+G=XnZ{g@uK$CnhF-)LKVxZ*Ok^9LI^cu3O3H^E0_z?&szy%1_}; zG{E@yxKc`qQmQkP$$YQ1jy4*Nsxby*40m^TRm-wI85*_+}zv`qZvomJf_8{=w81tPm=3C$kW6Wpqc)SfzEh!~C zj>F2z3V=?fQjxyCz9&klgw{II-`^ikCX)`JXJ=;#g+h-9A0`|QtD&JGold8@1iBL{Q4GJ0x0000DNk~Le0000a0000G2nGNE0DkM;BatB|e*q#% zL_t(YiOtn9PQySDh2bwY7oefe4N~R^X^_&Vq(uU83n~gaDhiOOBOxRo!4g-1fM_WY zEjXswUF0HxSh54JS$jOY^Lu7@mes1)*n8Ii^>{MfX3S5#;0|YaOdMq~ud{8EMD1XR zL)>F3R3sD0I?;GC9mIuq@es%Qf0r1`2y%eSvY7je3^kQtPlc@g3!n;nIHn(^EP!RNH--{D<@dR0&7Bt!lajN~L-i`b^Wd$-L*Tfe1YYia0Jen3H^N`v6LdU*Jsu ztbXvXkmD8SeF5b{`j4V5i-DWvtD`N&Kf$6?pt6{!#}w!aGht8VE2iY}I@=7_$)~Tz zm@;*Pkx-5&dS z6-7kP8YoiGL-kNXL{eE8C_}NaWTc=dtAXuquFdYa?##~4zdPsG!(C<7{)}{SuQ4C^ z!GU`Z=icw{cYeR$Iq=WuqIKxdf1yK%|0A+wyaGrq*N5CC6mUQVXaRVD>X+T}!t0fd z2X?Og!S}tas)pPwPO?ytF2Sz1VA`Ifh!Z~_5i~`4|kwzf1CssX|%9k z>|)QZO+49XGH(QX+lvAi0b`?ayRj-L&beCCWq97e5aKO9Qs57uL8PtW?stHq(TXdE zzM?idOm1tA!A3~cNK6iqX!nFIyeNFiEES*%)L6#7-*m{sJ^1H}%ncu9-?z{4_P|P3 zH$ob*iEx7qaC4|%&ycOO@L)*$LH|S zTJ*#O)$JRY`s6%E_W#Vs4pJg<3lIf*q67dKn}w~txZ~rLx8<08bA*o$pXY1Ol2KiB zTZ|-509Cj!3tb*=qRh1iR`KibQ4W1S$w}WQ>tYrmaRLBTL+DLIf3ZrqI>lAs%nO}r8GZ2>?@m{k4=lcmsZ1wU0Dx1|@Y-W& zevRIWFzZ^TEbG`gYu}Pc%eo zqHQ_S83R9F(2<`m>9rHDOc}r>_r!M#Ss&(`kPYzEku#Pp{oV4Q1HYa50)&qG_*ETi zInHKM6f1S~o)KUv-6?{!NA^mE40jgA;eD%ESZGix*JwhLNYDI#!=6Wk4^OHL_8^=3 z#mv>CEcb61fph?8FRS}~Hoh|2p~F4StvMjMS7Cq6f6ifl0-kSB%)#T`5dZ)H07*qo IM6N<$f`uNZyZ`_I diff --git a/res/drawable-mdpi/data_sweep_warning_default.9.png b/res/drawable-mdpi/data_sweep_warning_default.9.png deleted file mode 100644 index 5f65750e8b76332bd917e378acd64c30d31f29c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)_viUNp0k}l z8=m7insMCbWKp@zx{!7;Cf#U=ghikj%G!myDu@aajUa=Fg06;9vSuhjMAVITQ5sUw zt!!`t5hN(5CUa-2v+X?3w~J$tBC@eF&ncc4JUq|Uj}PD9_xF3A=Lh#@x2{Mdc&N|{ z!0_&Fo%>+BMqeLLGSO7$RQE|X3($ets|te6n61UkFdNe4%O?Ra`=2)Ju|3s$@vAN3 zv2RGN-+q0yx|6Q>p5UXMCnn=Yx&CG>C&-&GE=a1-2OKd7?Gw*qL7#M^Soc+bdfdvS- zT3Yn*@^3waz$7pSG*c}=Lo`8XD3e4tX32c|lYRN}4!z*wcmz~T$n$9)zhuQ1PX(ue zfF(BXKLs%0Pv9>aYVB7|mr*vwwO2k5j!%}XyuZ)eQOGDeJ7@DhT(k=>eHM5FS6xJ#;bb);QBh1 z&ZSug6jnJN>@6tMnO7Xp(cP}DIaieP;Q1#!0ClX9w|%o*U#FZ@U9!cuSJgLQBoc{4 sB9TZW68TTL^WVQA4ndY+*=HAj10IOvKMJHP@Bjb+07*qoM6N<$g2jS=4FCWD diff --git a/res/drawable-xhdpi/data_grid_border.9.png b/res/drawable-xhdpi/data_grid_border.9.png index 7557115beace218bbe79a5b8a0b310fe0a8e8ce4..6d552882ceb2256be6a1fffffce85f8e7610ae5e 100644 GIT binary patch delta 123 zcmZ3%IEzuSGr-TCmrII^fq{Y7)59eQNV9`52OE$)5)^)UqM}Biji-xa2*=FcK1VJF z1)jr3|E&e&jo7LSY&j1%OT5t374bB=(!}^_C&LP!*GCUFFE?SB@4bCRPyf@(^4+|* X*#wx_r#I~en#bVj>gTe~DWM4fy7DEJ delta 137 zcmbQmxPno!Gr-TCmrII^fq{Y7)59eQNOOQN2OE$)!oRP3qM}B;m#2$kh{V+7AOHW` zGYkFTKPqtU|9>8xo}M0_W6|>$t!UCrN&$i-1%??DdTn0oo~^hRJxlPWN|V|K10Xo$ jbMTSap}YizC%z0Z&t%w+U((P3n$FgTe~DWM4fX@@Uc diff --git a/res/drawable-xhdpi/data_grid_primary.9.png b/res/drawable-xhdpi/data_grid_primary.9.png deleted file mode 100644 index ff69fd814daf07a5208a6a46b2e136f81574dbd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2|p6gzo_Z~#FKM@k2f&spFRS&@6Ura*X98AF?hQAxvXK&3mO=rFM2q zE9pmxAIBkGXVd1}tWImqq2}!-MJ7=-lL~S3)Al_TxXyQ2My=*9mR!Z#xoR2OFf$l% z@zzDFe;6$R9ZJ!8*H>kkdcTG8S7{{5<4hIwpOScl+LmeN^r5ivYuPqPI^FBSEkAom zpqLyWom9E8Zwx2^3Q?B&!&Pd@N~KPGz?^1Y<^w{ic63b4dEkUQwC6Z_jlVq!-UY6p z+CMC?6iUm=j<{awBsn0@o^?SBJvS28nusO)j(^UQNzazdE^`nA2@|T;jWJKonc`6u zt;up@g8TzKL3=WKruZDzWBDLK(X<9dmfo-lK4&fs4n>K+&t>W5v$9|?$@TG!_-Jo5 z+;KS53EC8ia}w98m36f?=qL>E)0v&b)&EYtX-ObIlyngOUyT}zKj}6;t6w7#;AAY^ zu!2qtZ>cMn#tU7<_K6}upW;thtR7o=W?8*-jYRo|Cmyf*vZEt%F-)G~+URH^U^_H3 zq*3!cmaPV~6crV9$Gte-+GWj|H#Ik(h|~7!REDKfx4#=18+)#Y$2MV`6Pfe#u5Rw` zN3&f)pw8imQMEP-MjaU723l~f2aCtY{k`q&Z1(8rsNS@GMEM4Fr$UaLIa1x9a1>WQ zv$wZ5-5awVTv#ixyw4*}8#+ZZo16aopD793OD~plF&JW@^ULa`zS#Euwl@1tIN_%&M_2??Z%;PUv&lW^ z-&W@+(K;BIq?A-L3<}MNIN4H@(8Vx1^-Rt~Q6{h2waG7kl{9A_9UF6PFj4mJ-@}dcG}mZO!Botvd#nsz2}c z^mcb2t{oqJr^Clo$~S7tNo((Lszls01`|#`?`sSjVc=ZsFuIOhJNGY)q0uUY-D~xZ z4UOJfFmyG-%f8W(Wkz;t#vXO__1*3aGIcq&7~MaN zb`HMcNf;>m%a`o;0iB(XL=-Pm;DoZWvM}JGD7XI$?ZL_rH{`RaOa1YOM9qS+<>l^( z4T=)DL!;5K?{kSlKV&yoR+LUvdK7=MZkWZXtEE`TyQK zzEWCw?T2<|`p2*il8hQZkRqDmpAh%={J!(47>2qZu(B1+6i%@KR{YiGJ`{wy&(Wa8 z`XaraqXcS|pT2D4Q$_RRTN)DKB>U8A-WvS^`o<<_kRnh&*pnk0*&YRS%M=I}IGCEc!CK^8>Ye_0mq5c38ps@=h_x1-w2TY_jI?Y% z* diff --git a/res/drawable-xhdpi/data_sweep_left_default.9.png b/res/drawable-xhdpi/data_sweep_left_default.9.png deleted file mode 100644 index 4abe6cddf9b1fe98ac84265f72a289eb002a319c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1672 zcmb`Ik3Z9iAICqMcFV+c9TUR3%NE}ncMrdEb!ihLZ0CfUA7jMXRHOWy-;9#_j>#dH zEbVq%Uu1riMt&V?Q(`wXkt|<7Ml+1k?e1^5_v7(;KOgVM`~7&l9*_6q{dl|!e7#TY z*4d{60Kje!cML&8dyVK2uqMZOPfuu|O>_0|gJ>cZ62Z{ayDqo~(f|Nj@VB%a`UiOc z06ye_IpLRBxme}H`0|WtpHR3SX{UZ9mGbi#rH8&VoWtp_`MN-|u$biY;^4)k6~yfz zWa8Y3RT)ixZD=(6*Ryz>IMcag>JNdxo#{nSBb_LuUEO$-$7Ocyc6q$@NkQppsP0Oxw;sxKZNQDH_~VWlC?|2X zF~3CG-f*)oC%O=BN!2$e^rn!53X5LS+?I&LU$5b$_{4T)Rbu+rCDV z+QPcyyBKqM2E)4#+%x$%8?n0AKJe}fs-f11v6mY%ff+fxJdvMC;N;-gH2_-FIvi`? z{M~ID|59t^+pS~l;piTxzJY-O&-to=Zg{v@BB0cLFRtK8<_Wk~tW6;T|3Feo8K;H8 z?>WjHlULs>o%3w#<9?OP<#_JMeP84ZcjUL7p|c;}4VtrXY<)vR!|U$GR*cYVFWOVq zmt0aemMfHUaXPf4x}rikIyyS0PTl`Jk`|zfL6G_*_S}|tCcKuq-3_a9PWXR^v@zWuP9_@E=BuT1yjO2U|FS78H<$-Mn{4_rmio&RwOuA8HPWbu3V?Ra|v;j z>jF>Ft4j69ihO-@5wSg4bySkTbGtjG8S4bn?AAIDRExQ>_7&8opoc9j8}vKAj#FFo zeA`H^E+$zeFaY*zXEsNPZx@RyooMl7GWM&hJtg}t4Yl-~SIFA^IDU|hh3!vUK4)22 zS4ge_*bafP#FTg){1ys@YW5<%{D@M0ENx$QUvbL*A9?;)AMp8O{Q0&X(n=MwunqH& z34N9eyE)&cuipX?i1dKidrDrLUw>H>VKB-rSZ;HOoCq8SfVijS33A^wm}+; zL-m~H8HQPq!WD(Dsb#=2TDP1KGxID|Z2g`Hvdk&0L27mAbX^zS&A- zKMmsfTOsThW+$(2$NTd9&p6oI*OCJ#)<6ActB7c$dvZpZq|-H&zWV+JXs}_y%*}g` z!I84T<66t-B;*sYSZVYE3BMO5YPCS5Cnc%#FF#rgWc8dX_=SLz3Mi78rp+P~2m04F z)aLQsDa9d2OpjA-cm6OkuPTbLLzS^u^q}D2;OWXbhWisQZxkCIj)P21v?a`sf1$ts zqvjYfcV8^$Egt7s=^tcA2q@x-R+`*{<9BFjyjcN+dqFI<1)}Je0?Jub>EpDmwIa{5 z!)bGlqGXu17>Kp-#&0~umY2Xe@Lo8LrE$ARG*T*+55yvo=z^%g)~%8jIWBna23O1^5n^-cLQe%Fg3N@lrHk+;{Pu zNbLpF7QnJV8RS4b;wI!SGA1`H;FQgbC2P;0v&27Y8yTttQ3njYcDTdvSq#VNPG2P3 zwfiPC+0&^0l|VUJ+p{TG$o*$3Mn7@f5iCaXVB{T2UB1UvmDJ|XkT}s#W9Fut!n$v) sYCA*Ga9wcrKgdIoai1;bLO#z8hnOm9B>GWahUS$39$0S--!(MrFCk|vV*mgE diff --git a/res/drawable-xhdpi/data_sweep_limit_activated.9.png b/res/drawable-xhdpi/data_sweep_limit_activated.9.png index 24ac5712c542d721a7ff23f4cb321ea0b0ae6b9d..8f1e4961811b84baffc3d1edf26ef0c760167211 100644 GIT binary patch delta 665 zcmV;K0%rY%4YLIyiBL{Q4GJ0x0000DNk~Le0000+0000U2nGNE0Fm=(9+4p@e*#rW zL_t(&f$iD7YZO5k$MMfyE@&YVwHHJ?F}@Tc1T7Rq5Csc63l*)j@K3QZm4yM@V5Nv+ z8+?Hvilr9*0S3WF&FxyuGw$ATXhL%5p1B_!w>QtuGxL0JW_D*DWm#II)_mi*t1L^c zf8B}o=-Z{e^`GtdF0c(}a1O_@e;>QTzJiZbjz^z=J0BY`1E3U`#uePb zA%Bmj#CzPuL;S4yLIr0m!1O_xLKg>dA174PypUpQ>s1l=4CNvgu`_;mtS^psf7I!QkHzrW z1EObAydlEQBr9+HnsvY5{Ce8Tbt5Yi%_f zOpKV^$Lp9gU_IEN@)VuJ)m+$EFaf2dT1Re&X&6t^?DJN%)m$(!jdK4^+ zfXT|!XkNTjPQX;V^(8#Wg zL_t(|obB9Sh+9=22k`Ijockw#rpZjkI{&JjR-0BUSg>eCe5trDY@sWHprEe154y_= zS_Kt^Dq5B5gW!XIU-Ur~pZ3W|!9@hweOMo45k>7d$xLV3%%9}u{yXRA!%b?M)>_A8 zCf7M1I3#m#n4IK$&!2m962jVWf7jo%#{Xj&hG7_nVHk#C7=~dOhOt3hDKYB08}|G| zwvCKsowd#Sna3JEv_F@_l9V83cQFhBK(%)D>ryuZz%*bv`8=;O2UX8I>j5VCKC_5$ zWiE#g78i$nrSjI;n03olSLGBDX|4MbycB}HAkd$F{`o2z4K0a${`linfA`=)gq(cL zVm@5yBU=cJWip7B%GyK)%eFIbU3={tJEXh`T8AJKJ%3VW5D_BVj^>y@dF{LJp83~_ z6Z4a{z54Z`LrwbdLjb15_l+b1**2EK&@K`U&qNWwy<^AG!Z+XC)~Hr}3E15qarP1k zk=ZsmdBi6ULNNn5kf8mclIcDaDLt&m-6OGVC(n3zw#L%kc|Iqg6}awgmK5gL*IT&6OJ=l4MX+l z6;~WO5XX;4v$H-ig8*W!`&WrpchAg1#xV(^EST*|GPEclIRcCxf06(_xosOJT(?jS zLq0q;weJs>^#W#R?KqAVC5fy{T?k3@jsX{d)nq<1r!&F#kRt?a%i?1*Geh+-%w1V3 zP5q@x|O6xGH7lnTd(#wk|I2 z^Ou+FL?kz=Zk*&yf1QV%3BCse5fn4(T3eS|R%s!QoP>Uyy0>YaofB90&hjS#h=q zQCtD6%A5qHQ z%T!f%qevq7%=n_w$i_+)Jj)t7Iyw3L=;Gql!Rl&*fBLbYqR&!S;q@koFi|K#0=8rx zSyGDMESDd@tX8|Vxv-F$$y_%R`~?UixI~!uJTc)oBXdy{9xIpc-`!~Z&97Fyv~};D zQd{x$u+_5QX^jaXN_uC&e`5>@pP)u5CEK7t>!M*YHR_D zTL;BDR&?M{*KJy~56=id#LVdWrLr?!eKYCS-2li6B8aY~I-6d)S~>&(8*sm1{@-b! zF$9p`5&oIrTPrZ70_@}fIp??RjFb=nmVoHL%>RB>>vt_6(tr*-GVSciG61##7y~d0 zf1n5;ht0iMqdmcG7wXzKXxhOl08Id^02Tmz51`uG76CtnN&qx~B_yYG8i0@FV6ZTl zFVZ-_)^{in0H^~v-6}DXTmk$PJhwJ_t@}*?SpYW9J<>O;&Y^Em-;d4~A0f%nL(+&N zoG19s2eL^BfaL29gD4qK*7^(?8{mhw} xVHk#C7=~f|ZV|VBD5r}#4d|~8Jym9A{0LW_S?l^$Yo!1H002ovPDHLkV1junBNYGu diff --git a/res/drawable-xhdpi/data_sweep_limit_default.9.png b/res/drawable-xhdpi/data_sweep_limit_default.9.png deleted file mode 100644 index 9ce466a2ff896400392fbb54c643f03d1786fdb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1534 zcmVU{@45HAr+@RO zGm{w;yA6}rwG-+N1=pcjv?&BaYbY&r5$L9bhHhFyvd$)1b(KvwZ6MG>XuT<>h5mtt z7VrAUP#n9EEF4db(>fVTGm1tU>Ak0WZx>HWa<|(7LShV=_odgV z!B0_S48tNcb8n@xbS+JXbE~V1FR!hA?LeMCzK~@PHk?};7}ISh$)#qJ{Q0G8*M9f= zbLXzy6Gd@zIBY*SGm~HL^~l2RU!qT!20uk>am3d%j< zIB@CG;zpj^=Z+ow>J#<)OSP+47qVuvhlq%^f-w*R!MT9fjt&CnK zfQYps)*6?lS=8ysO1=JNTd7<;+itJlmn7yyl4O^L!_w-Fc0INfUFY~z(-~op4A63} zvF%*t8&UMs(&pxBw!PhzIF9(Bkvn=$qR8f1me)5n8sDCq`{66rp3j}zT&UN(^!ud^ z`Q5?SfcepVL6>`bCu0Ad=jPDt?8@ONI^|leTtw^#hCV3-FvbjbcKQo({P1_9=u1CN z)8B6NdR3rbR=E+y=$6mdYW8BkpFCEre&&UvM_*0m=BmMa&t2GD_{bTLUSr6+UF6CY z@ABLkWA^mn35W~9HMX~FpY{GYaJK2(a0&XYk}7_0#5enW15~yLgUY)XE(8lMfJdkM zJrjyiR0kxE_y6b4VL~_v)VD(D#3C{}sir>VkAs)2xV|SD)Ik!O}es0Wcf4W0m4FdfLwhp-Ohz%VcG zGArXy#|7>HO~3&Iip$mbNpI z-(=8^VJC(1c5k?G8ut`$mX7Z4P!z0d`Mt3jv=bPvgL~2YpFeNy4-P;hg@GSk^+%Tk zLNVAv4U!Jqd?=xtADaw5Pz3KOt}&BajOxP~idB)TK>SDV|27E0 zJ#Fn1$3>1*!4JWC2m(Z4J=ixxc>8DG|N6A|f2zSCg?E5-w3IF__*;dlf$xt{YL#q%-TJA|bGGr)WW>UFRw_?@DUdKc(cU@L|H09(8ty5la5c(s4R`(Jcb zfkspWzL-HZFP=9*Fp$?E%b}eWf%mvWp^pny(=|Er6N>+}s|r*EVgVD1eZ4#sArB}T z>Xf3l@{~BmPZp`BZ`>4HiUxY}Hs&ar>G91`aznSfKvkZ}m674bRnj=*$*^^s{A29@ kVzB+MBJ|8F*If_)zlBLA@kgjo+yDRo07*qoM6N<$f~AA$d;kCd diff --git a/res/drawable-xhdpi/data_sweep_right_activated.9.png b/res/drawable-xhdpi/data_sweep_right_activated.9.png deleted file mode 100644 index 0a3f2dbb94bc8f52c681dcf376aae5aa94e9b544..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1852 zcmbtV`8U)H8~@T=Gq$pfrBI_7T_ekcu_eaV*u&5mjBD(SWn{TwlE}EW+sNLa7-XV5 z6*UO&YfH$L6LC@YnCw|5+nwHj;eF0|p3nK5&v~}<{P3hZ+FOYVoe=^6KooP$+=+*} zJf}becro05W`YNxC^W_e!m|X3FO|myBd+1106;kXr}LqD`|1EdUJs;Gg^mxG zv^sI`^Vrr8bIE3?qavDmv8D}%wr(e9O1wrdC)(sBTq3ot)h|$ay$hDAc0q_$LEufz_JzNz+`-e0?MN>_+^dBbJXk}4WVYrVUysOW1zn{ zasQpGB-2$_1a`DO-9ZQzent9cM<@vl9CdqBS#@v$qp*7h3~eX3s(3&C9~!@SbL_-x zT-;5S8-5r|@4QP9@Jloej3fvqjg;GNy>r+1atmTCiMhO|knbYL5ORgW(THc78#^*` z57NC(7x>^YF)(}ic3@ku?R3q;tjb`t&!F-h*>I3gi#T<|64ovE{}9ssJKS#-8a~BU z;-}z{yF-wKC#iloWi0jr@Up1rbQP!RT-pjXy9=VI7rQ#a%=gnbj9pEb?#_}c_QU-- zZ&~KErl63a)g5uLx8a9QzEKZa(u|jcI0P<_PV|F=$NHu)9uE3Luj=JG#2M zoKw;NnR*f6FcB%=;Gw>INuSW^F`BA`xyjRW84Skp{1(?qPu~6-t#TW|6CsM7(VlP& z?Xt1)(Z)xn+f`Ml(8$}j*IGQ(nGB~Vi@n^Ku$?(rACg{JxEC4}wA98;n98=SNT+<) zCukT%_a+t(_+Ql&=~%TQw-W3^at&{O{aa?V-g95GY_Q<*P#~ICS*kpm_Zyl-2A?{6 zpqAVF5Gm3z)f^i>NaKv}RTn>ed{Mi|mQpm}?=Z=Z>d7`gFL)i=TwxgumQBY85RI}NbH5h&MdqS2xrh2$qMp}BRcb=@Q zp|5;4C-x?t!x0s7$gZum&h4E;MMXu0%ia4eCp){_(5`+h)~mKRs2E;3ytKB!t5^>Q zn~brDR(Nuv%!#wT?BXgGZ~7I6O~I5lubG@&hD?S9n_jeMLgfP#%_HQ~mYURU9UP7| zQK;RK<>gw1lW7DHY;C-O$>?iur}8<#Q93%&w_;*;L^ar*3ky}>^xo&s3s{T9o!5`_ z_h0Cr?<@FRV;8o&I*F&r>1lmQpZn9kx~(l@`oDr5nom!FPb%r^>iYIXmX0k7IQ`68 z`Z`n*;2#h`AmDH;vqz5nNk&K{KNeeJO!4kYvg*};)s(+v$e zV~s0SIV77*t&ta^Nsg*{HT9fL7P05OM@!sB15f`|B0W&W{vlA@(lI=ud5cJ_pr=JA zx64LBE$;X9^tADo$9s8t9vT+(2?joY>xTE?a5xGdpWA_e2U_ruV(DMXr{2W7nG>}> zN2m&_1$>9KnZk8O4V42XWk$h@DK04VuX%jbdX8=)I8Tms2EuRw z!JMqi5L%kurCcvmfzP`A#xeXY^V4O)&bSL=vsosYD1NOe$p47wYG+|=8W?~m+R5A{ zVKaXRhrV#9JJT^IypLUTVkC%-B*U7PxGQ+$(RlUcCUt~#hAvl`j;J!*O+>LKZ%( zPk&VfJ?1p2GhQM}I87&k#@5!O(ap`xoPfd7H?P@jw)!74=kooehUQv*5OfPmKkhCa z@DdOkjXqTN95u^i)z_i=Wr@i!$6@V^s-SwlI1>mrODpD-iFh8tGVTx8RfN+T?36D~ z+T!|4+u?)Z<{p(t@dUUxAP?l%*1{RzbI9xiL&eH|*^qH4{)vdGg$ZA|BpRI}Mi)DO zxx0x?Hn@=TI+KMY_WNc^@!bGIT~g#q+ufy@>Y@ax2kUxuVeoE8?wurLl7uQc%nsM_ zt`Qx599$-`zSlo)r&azzs%95ehlm%tsyfVMZnvxHpZi;CTwaRRMEbG^E~)p$tzGuZ Q=Dj}vV_|PzkM>Uf7s=6I4gdfE diff --git a/res/drawable-xhdpi/data_sweep_right_default.9.png b/res/drawable-xhdpi/data_sweep_right_default.9.png deleted file mode 100644 index 1f2977827fe09bdcddd69246a88cb49ed6013be3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1686 zcmb`Ik2}+e1IItEZWhBxXMWt69L;xO=$I=%W~p%|<4QxTjh=KF8b!28O>;&a6MdVx zi+P!n0FXN#=M$RD zQx*qsb{{e8*&_eYG%Q>EGpfVc`dro{TdXN}2j+ph6+(msPd!YXe#t))0Tt#vGAcY| z)vVy{z}QTr@2m$KE91dNI)?oVorundD;yU_j?i+U>YZ=fF4NSEuk}`p!@Vk_TdLnx zk(tZHfDKcBqz3e+ks7pUUJP+z**=f~zXM&3OBUXi=_5IQO3+ZzGI%lUB7ovy=(eR? zYrx7nX>Mr0K?ex<)X?e@J;MGbN1~M+Up1I@bZzdxt%zb@&Q=+t?2jImC)6%ducQ1Da6>HTun9z(qYjCfj5G&O}VSoTM!S zw5FS8GRz4U_Sxdq67kyyA9&Q*SY?fCa>OMLj5rneA8VBOq3W)yek*ba`#$dWe9iPK=3}ZRRFqfM384 zrLBG5%(n}A`ZRI2-wn{PSYO6bsionluU^xdgk>t-H%CQ@9(uB+_pJ+Q)q`Rw|Iqp~ zmafU>ar**70J1=l!pOt3*|+rzUJ z+EH?rejPpJaplj7t@qEa&my}kg73n?!1%}rZ|R^TbLwS5`={~tErTbg>Yl^u-4*y+ z-U)35Ps83e%{LcMg8q2JkXcjUO;= zVCk7A6{C!>`#7RCBg0*Y`-vXK;UtpBe!;8DZISCEEp(XTuhFP=k8+PuXk z1s@dyMOfuXQ z$2@}DV6>r;<-{i9eysZ$PD^ZI|0q zG;51Y=ewM94WzN*A7B!~cLuhCsK!{?XghN&MLIpFWWm$R zpT?BcC+Zjz?$Wc+osL=;5QJd&LAKJy&ps3Vf>%&bz-+0_?(XhhRcy;$(FNNp#ni_R zPxFLx%U9;6CHKgY?Tn4SQ2W8$`xRB(cL0H5=4DQBiD!5e$LIBL_6i;X-D*j4h zvxj8n&1a9%Erj#y3@vX)yu$$)9g*&k9@vxM;RDr}BpCJL>^mWF(|Maa^Tw#IpZmV} zA13#Yi&8~~)k7B40zmcsM63*j9S*jGJh!DF3`E=x4xjZn=3YKd>W3-<-L}4OY?#oM z|LZY-7JIJ=B-fKtd3Vb7YJM1zKY4tz?y7A73x_h)%ayavuDm&)XHniEbH+=X%O-j! uZ>NpB+?s%Zu0K2N1p5~nrmA*xc3=z0HlR~N;Yj87u>knP1Y9llbjII)T_{Tc diff --git a/res/drawable-xhdpi/data_sweep_warning_activated.9.png b/res/drawable-xhdpi/data_sweep_warning_activated.9.png index b62422810250213d259432dd5b4b63e33ffdd92d..cfc92e1641d87367d14b2b43564f5156e29b66cc 100644 GIT binary patch delta 668 zcmV;N0%QHW47LR!iBL{Q4GJ0x0000DNk~Le0000+0000U2nGNE0Fm=(9+4p@e*#!Z zL_t(&f$iD5ZWBQi#_^x+h!Tm*3n0;g1O<^&q(Kk~iWESL5H0XF2qX%40*Y``f&>K! zL_kUqml7!G6NL&0_EO9lJhoCKiXGO8zh>7vJ7;G9d(L?F95%0N3-^w^8mJ~`X8-p* zhNU)E@da-&k7xLWX57=sH!m*Cf92DvX?LrI!ev#$ZZiFh?1KDV4z-Vl=>1iZ9?DP@B;JvyPQGA7)M{ z+g@cf!2HCwINu2{U#T~kN^G|9p}028@nDG>gNfWop6q-aTSFYO72`do#$X~hk{8|Q zc(3@#8?ds?B|N3ZU0Mmi9JH+w+{9ty>S9%L?GN215^= z?D7wA5kGX-pRIULC;GI)#)Yui6QZ>T)29;76y8XCot(dIOAp?^azN+uNzU<3MBgbq zw86SH5@5=Dk8TKj#x$w7o{-FA)wX=Hk@`x>Wr=kkPU9R- z;Rp`IJu6a)_8p!`CEDM8{n7gZGMGW{4Mqz1M*0i7Eup{6EB&zm0000$Fc~A4M?*HC%&pGd0e+$b)yUt~q-{bLkJRXn7_0*`ktYR6a?91kVwAys;gHBQi-FbFXrUv(|?(If8wQMllH2y z(C*!ttN!|#1psZ$_=)L~0dl2EoVU{xY6Pp0;>~^UP+$zC21L#Ce)O)wND$_4UU&7* z`|dD2_gehWPu7RQ#B|!aB@K=VU<6Pvde0D0g}^kA=6PRwSWufHw`P5-N@F{XKRaZoWjtwe>1HaZ`G~oaY{~AU86ibM4Mf1o4=*?aX+3VBA_afBqj{W zgNC195QDSggv}O6vEmHR`{!63ewMp|F`$4mN^21b1d}Sf^hGl@!zofx(#e>B*aDrrcXqh8mhM2 z+&SYdkl<#z#m)YJwHwO|5GIy|Lc}$nUL@ZA2G8&N1@~{x6C^2C21R@)xOBR0;U$-y z{a4%okd9+5k|nV6f905@5Mlm$nz#0zWb5O1uqzZAmI3RWj>dKipPBrw+tw@wHwkPx z=F39F4SP=Tx9uCb>W{Z@mrbcKpcb*)x$DHobL~8L6_{(J$H*ZImrPzn)v; zc_4+aDGG?J4wi-V!vAnmT$o#~Cd?EfO2?;|c=SIUswQY;5FH@#z3@Mb z%;aa`?qWISi_wVE{tx-rQ}6I<3_0oJ3%6e5g}*$qP`3swR1>B~BbFX}lUEOa!keLC zm;qVuz3`XEeW^w@we;DV`+h_PBiWs&7Aifv=^2x++2vieGF%XKWrTF{T z**AHSVlHH8wTthCUmgmi>YTl5HDM++%udd8`rf~D;Cz{C6cDUtXU_|NWu!n&V5y!m zwJyi}KfdJTo)i43mJk?&tXAc{@XIGlai`k$^rzP4e<(lwF5?G3VmuJ?usTh?7yin) zB+RqQ#if|(k&w#$M>%|Cl9N%$$ZA~gz3^8~%h>~Js+>=i>0H3vt|J_L=PM>xqqFCQ z?+u;eSL-Q7Bb-}oFn!-q_D?UekPC=@BxmnipXr6~9a&DlE>NzywC?k|If} z&{Zq%h3`F`Y2Eos;&S>=zRhcgKH|6-hQ-x2_4P*#A`$ujeWo827g^dcj49XK!|l5Y zF+9toGp$=wWv*cvD&z?~ z2EPh=izPze`2(DOl2pBcOHmhs{Hve=zn^GmB_Z7_9R*f{Z)Mm?^17<~-QDp{K zKpSU`^Yjk^LV>)(XlU4)*w#jsA>6>|HJOuH%Y{?~=IaSX5z4C6o7cSXD}cc*sY5{C ze+UI5X+~qXsA-NN*U*G)N#H?=LRlMAIVD81Dx17+&~EEPx*Q)m5dX*fiv&f zUU@J43evep!O&jY`_=#5{}@3#j#h&_E6+;x`)YkT=<#?w9*@W4@p!J7{})#HFrdHu b=wbBNc8q1?w1sHr00000NkvXXu0mjfDuNjj diff --git a/res/drawable-xhdpi/data_sweep_warning_default.9.png b/res/drawable-xhdpi/data_sweep_warning_default.9.png deleted file mode 100644 index b79e811cdb14eec6d0ed42c304b1503e7a00f511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1610 zcmV-Q2DSN#P)`6pHRCt{2+ii$kR~^Uk@Bf~A=gw31 zvAc1z-89uUO|zjWLDV+IRFx-)a1_t=lsvPJHnN* z+m7W5zeg#hlv3({j!18%Pp_ZrCui5scoi^?Tz>t`ho;T_cTQBs3_joiF5q2P!~fVF z`zrUp?xpnlVlgXR6>6?0~;narL! z-GNRMaHqzr$@zu$IzXjl2%@y`c53i_R4W_8)R4rHJ2~PF&o9TxyWjP;$*+HW>Ylyz z=sn}L=!Sa9j;sc<&Gl+|id8!t}8(-G0w|r+H-5EFL6Ugs_>C#VMv_@b{R^8)GRM`{NH!gkOE| zJI|eX)3EO}npvajCD~fL*x*f}-+mPlK|o~hpffVJ9P^Wh-+KImw{*Te5T6;RIp4H# zn21P*7_eDtqh{=M7Q>p?+&{g)_Wo-|M*sHn6Bp0!9dgS{ucpC)F_+bLR#7&!-sULje;1h0TplofHX{YbSmH{$a!(`_(Y(}rwP6UTEi$*HpzE2;MLnr>h zi%F7{1cHJ}JbSsvzp@%QfWO}E`1brsYlYNWdT;&JZez7B9&o(_PP@@8rn%kVB}gzpDM+YTBjnpiRzrV1EMPWf$SdlqmN>-)N^b|=9iuXxB?OMs)5<6l@cwk(o;-EIo*S;>URbpm z1@(5=?9CR)fPg&s4zLQ8$d_~){LaLJc!r_OGW?Av?Jthr$eZ_6anqQ@>=1sMks2TW z;*wqb!q3uQxrV5d@M@Y-Xz*JDb=Y`h$mZiigRbR!=#? zYG(%U!-TZv<9_qE*%Pgh@S(fShu<>61VTzmip7e-h{2E`r)KQT7k`@m_}727fABq8 z?T7{P>tEbPJv)c0fxkWu`AAs>Mk^i%f|#L^DhEDympOX$fE=FQ$N0pcRA(D@{q!q# z@tMEdlaD^0JrB&6J(fE$vp|Dn!qJ;U4TISUjb?*m!Y!Da4W)3Gdwo-_*_F=^$3EP)i`B^ zJn(=#^ppZa2MxXmLO$QSfDe=b-w}L~%fV;X5@(hW2+4=`kUa3hL+>_H^v#2g~c;DVYRh;e(;B0w?JlyWyN%uYMQs~`=sok^ndh3%ArIb=iDW#NB zN-3q3Qc5YMlu}A5rIb=iDW#NB>J9Smeo&$R>|d-m{D&<61VG0*3Z8l;IsgCw07*qo IM6N<$f)_3^K>z>% diff --git a/res/drawable-xxhdpi/data_grid_border.9.png b/res/drawable-xxhdpi/data_grid_border.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d33a7d7a6b946bee2151cf4b27e2140d2fccbaa5 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5n0T@ zz}*SLjOHg#uLTOac)B=-NK8FC!H|nVf#*ojf9(!_!GrAcyE`%pg_*ZcnX=ebNV=$r zu}jl`_0^=`Y6~9l#M*VS2?X2u#b<8avntKz>$B1(Cn2^yt9{-B&13L%^>bP0l+XkK DH@PoZ literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/data_sweep_limit_activated.9.png b/res/drawable-xxhdpi/data_sweep_limit_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0457329a909c802bff19f177d82ba11b47a71fa8 GIT binary patch literal 983 zcmV;|11S87P)S(#d^uA3-i&o!=Nh=CHxFz~*L6m-ZbWUYJiDWO zI>H=Q^Yb0J2Yc{v-o6XB=KX)+SDeN-_!4JuHt(OuSaD)69*td-83Yv+a-v_NBOk{> z9KgMsJnU(Fg7@*+q~mWSX%LhtoC zNzDuD4QX@I5Oh0U!OOTQ@4F~<=-ei&7)ui3I2Z6X-oT$lo%pY)rUmun#M%51j$n5# zADbL0nol__3I*%vt zqh8|B@(>rp%^i5p_RC>S#uDDmZ7Hu)?FlNPr;~=0SFtP&Iol~Gn9p@Tn%lDOi)?d( zG7&w?IFz@y`kJ#53%L!4a+@wkQB#6?X*KCfXmrl3iIe1TS=f}I%z`wG?8jcIV`@m2 zMp9e$N~!mlHU&kr9K@n@k*-D1s??_EqOdhVac6o7PZnjh5N$btyUT)Bh)B6#x+}e^ zu0Dt_s`uf6C}@eeDY-n;R%}cR!H?0Np!o2+^4}V+J$<5057M3>QWm!}Z`UknCyfcp zHz4PwB%xM9P?Jdl=`-Jww`+``;5OP6#P#vHFLHe}v{hCZ1l34nn!hjzs*w^S9lEP7zEWsC*9>(!3R+|2&#wpW%mnd4tINV z5-MjT&F*=^*OwV-xSfqAZV6E zQt$^}zz>S$mgVI6Zo-7Vfvuynw%p`Ao|o1NjTVod9rs^5M9}sTbHPWFoD+CjT6VH- zSSuL>Z9QY@$G2F(bpdbTDSW551hUU8Cyd{yOj<-d=PDNw4}zvoe?99de2kCqY4IBV zM-GFaY0}|u>B4_Tijw1!pr7+=uKFKY%xd{X&9iE%;9o}S+XA7hld=E+002ovPDHLk FV1mSd#A^Tm literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/data_sweep_warning_activated.9.png b/res/drawable-xxhdpi/data_sweep_warning_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..670bc195ec7d89e7be78a2f28ed30d7c94e06caa GIT binary patch literal 1008 zcmV` z;ZgAv5=a!pC_;dQgbNBwLHq%9h=z^^K|v%W8jAF^bcuM2fPjd^JX3)w;)DhSF@+TY z5e4?{P~3aG+@G|X-Mh1M&))Anch1b7vs{_#EBt)XWmKV_otvMw9oK?} z_#1!XEPlW#oWrkqpMKtNePVxi{JlxXtP7ys*I9gqqxd4XRe4)85mMdTRnxkuTJn-X ze%yl>@c}->fxJ&Gd6Y>GQUL9|DrsE%MoZc%Zoo4*i8rxd0@!0~NCnXDtB321JnMSA zjF0hfZrhSW0kn4t&#JM8gZL}WJQxi{ z?NWr;2PuHssJQ+15Cu>h6@c!g0BWNGPze%RuKjcu(AAKQv`RMtMfMHt26d5+0m{Fz ztl|8WO_`*aG|O}hP}TrT`FR^XC~R7ydw?QB`Z;gg4CqI?2PnSpw^OxZvSJc_P4@uB z>|B&GJ|l0fEs7MZGx&+_0g9xI^Z2yU))s{=$MFZ<1H@;O z1hgi7?=Ph^-1sGP+Nvd6PD-|QFDGG>DuTljur?%cR+24;n~j|U)X-2GkZ*9rXmF;b zm?THCO_i?ZBs9Dza;4wEX(^*-Fa?tax$o22mY#-3cMecP;YBNWUb?l?x3`c6xzFWn z!-|IY&{04QFN*q{MLdTK(tz#7a<`WIx{&)`%(e`gHg*ya8z2p(CFT?kNj0W3(g5y8 zbQk3(Gm_^V%6-omt8AddfW{QF`2^;$APrb7H#-3;3b?9#?1kLd2@|}wzXKg#wfg;+ zGw!(i{&*Sr(91X`jm-fgP^)>n-H?1}Gyy97hqv&8RQS-h3T{r$w%LZ3@Cn|> z=bIgW(tjlsKw}!KwvKD1@R~a%K#$=O+=W|lle856Bi)ESCwa+&1n9T?`R)FZ#U(Rk euT>_^W0=XMYTKTaX@AhLYCY0@TPb+%37Dt4Bx%pN=}P2R3qo4hf3YqNRT zh77iULhv>OK}9c$Urf-G2L-{SAUk?h5aye%ogT&x29o!A-aNnO^Y?62X0D8loExDi zYOFM^SIIe=yvL4`?_Brh4mr+ZqmE}$6ZfnTQh5h8AYJmT1z3favvlhNoTRAKqFbxu zdik1WBagEZ8!q+&f~Kg+sW`CgHpFxTF1UV<`SJV}L%U9nxgnQ@a!`aVcX~O5v&%Cz zd%10^4l{L$o{Tl(z=PPLW3S^!TAXA0el;Q|*E~b_O>jHM>?Kt%SLh-NAuV$3K;!vdugCS$910hB zpsFe_h`cDW#Da~Md~C(6AB_(^=rFQFH^46P>BOVeKwX?;NTz!wctN?m@7Rw9jUp}M zV=LeRC-9z^)YZ3+a25Vd<3Q`EwiH0V3M14FZ8DGM_z+BbcX*)0kYuA>4_z`8tD_^k z>p>rv^c+L}aE|L}MnPAKhMCthqL5JlP_n?xr%lz+(`iLAl%bDD0oFJas})0NVHDO7>I@lBX(5cF77FO%tW1|J z+w~JY8P8s|It<<0&@n^g(f$5v?g8=DCX}RXQ)HW}BC}FfRM>`{5GUhEjfMr%a#Lak zc;|om#*>8jgdqPAW_U$dn27uIC(8Z;L7!|*NY-QY%Y`CYt+|q(uf<;*zjt@1Qrf)Z zY@fP&_0h`t=)`74UtJdp^8NPDkK31-`8SLFX9w@BZExABXDcg59(O49%)9q5-hSJy oJy|_|@6J{uHF0s{>H10fHMRKb^vlif4?ZQ^TQX+!hlTmIKlwyc@Bjb+ literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/data_sweep_limit_activated.9.png b/res/drawable-xxxhdpi/data_sweep_limit_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..3159b0459bda574dfd61b25b65be9e90fddd1008 GIT binary patch literal 1839 zcmbVNX;2eq7>;&|_eJA{ipvr)pgA`8ZjDaJZc4x)ffT9MYS>+1fn?)mF~N=$4@6=$ z81XJv4v%_PN3AHeRZycMYO9@!31Zif}mB3U4nOsDKxu;a`RAV3jX zaIVrMH97QT1{JfEA(NKITkxe>I81=EW&$(Z2xq`XvR1%t%eFfaw-$V57vc7SV+jbn zQem^S;A>JTrUXDwGbErCD@C|e1_5eV3@H^b1WgBIQb;a=q!Jk{f*?epMj#c?`+%G` zhDbvaQA4jUPSS!IEbBld5|_&*cFDywlP-Z^7?wz75}8cIX^5P;cGl_^*`48i7EscO zGn9j+Xgd(FXicSaSS`pgeI0_$VKTijYu~cHS1>$<8?PL?le`&l` z+iA&lkdj2wN#`&)SC6#tJ}{TNcRLCwa%_+}48;}2nvK$Uj*YalMpO%OH)4V!5G)$i z=rMy1Rmr3(4FqY_kU=Lmz!)l*YZREK&&J!Z(Mr8ctyJrzupEOROaU8ouwEro8Kg?N zMlQ$tutvL+wc2sA&o9OK?Zv|H#3Fizw6Zi~q3P_t4oJwLS=yOFI{>{N5SpwwWe>=a zf%?1-7bO{L2}u|j+6KHzFhaeBK&o1urh;*qNQJAUA_YXMMKB~w6_Joe1H+`ono8hc zFP`{6iIZ@IB!Le3Psj8facvmbzUhBXcr!tyof{j5n~#N`8)$Cq<{43)#of?edM(ak z9(S?hP}uH>IR4nk2Jr6&3&F?MW+*L$sG)lVdM{#RL)?K_-OU9FXU0%tu;K$VGt8(> zmRXiM=pJgCN7X*A{<&)8{W|Tnub$`Je|D~B!{Tb^`bWQOUG?9)4)3_$Iw|SY;rYLg zJK2WRMkPk54Z1q1tJ(%{FZJgU6OQ$xbiV*O4=A`r-ZeaTWi=WKTu*M?`jk99=kR4u zbd;|m$TWcI5AUlK7E1g=X43f8ibwnl!*wAySa5G~P|c3(U{8!>)ic!Wi}c4TS~m&W z@)z2Z3Ekc(YStBn|_`?uWeAvP@)PmH;ZCK+t+4pFACnazFxO=GJi^*Pf<~| zF57F|vNOC8xO%*P^TQSHhk& zO<7~dk1wy7Ji*lh=ElR($HZlNw>NwFbU0pn?x#(Qj1zDFB~C6`bf9SBtqHCbvzC0I zV6ro``(rnco-z&*71x?^4d;2b@{^_)aM8Y-zOZY+wS7@T4hqvQrwEEFF8Z2o;X5~~ zyhTagZPZ@FrU%DK{l?M;16=AGePQUC=_R#yzp=I6!q+#B@!CdU(4~mGmkj2*Z|^)g zYUaz2-?O#(QXI`PPd1=A(!92+_jx!FgA5dX7vx!kXh-mA<<6qsa#fr*CG{bEnxSMwUaA_1hm&|V)z9m&4UHw=RFw9 zFK|~EXC}69;TH@{@>?w%>9RFo`uWb_+qIpeV4iVLtkxL6;OhLmsL7G_8sBmOo~O)D zn$ry~Tzqz}KKNmU1?q|QQH`@=I=@K%m~XG?uY37iHT|IQ_VS5m+6*T*hYyG6Mu z3$}&%7%)n~J*T=lA1DtDdZG^NcMG{KAY_JbE~K(TaZnKvTp) literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/data_sweep_warning_activated.9.png b/res/drawable-xxxhdpi/data_sweep_warning_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c12f302343d4c72c10601b3228e59e3e15e83268 GIT binary patch literal 1836 zcmbVNYfuwc6plktKoLa1QV};nBq+&d6G*brs7W>v)F5Ci)KPSkEU-YbFO zByfGs(lf+V2E#3r)Fji%>Nye}W#Hm24A*Kf0dEFl>U66K*JTnkq$Scwqm*_3_z4z7 z>ZPotXf;o5QV{86jLl5Uv&Ct2woDzWXHB05O|?n@fq|fL$ZE(kS|nB}>kY32*sf)m z1-*gLnNrqUQOW9fNI{tiD4HA1(ed~QBtp4JbQFppkr1DU2w;Q<^HC0hNTNg%LEun)9 z7-7+wNfS*{M##m8YpG?llm(Q&J%YicR=*=QS_TpYQU+Ub6O3?qu)*Lu*Bi8jP9*-7 z@m{n=lVc*_M8ZNXGwZ;8q=pVUgWP>MkP8UZNamVJa4C2eM(LIr2qPVfNm*crt0(mm zr5qD0lqwk}(&w1{wlfg2JpL^J0XE-y^Q8#9;mu>F?sYiZIZuP9;^C`RS(bgxc zgj>UFkJLRsn!ewivnKyy#-1m#lFrVoLzRc7v|PV={m!#5%Q$33TUOqy`}*+**KVuI zAFB;QUM!h+XT(p~Lf><;!Cpt#SIox0vDO zpL#s10cH^v*zHjev=93#V&Up_`9ZCCx2OHo#F42blMbMgmA(Dz0}AK-Xxu*9UE9<< zoPD;ND4cw*LSFkzY1QRTH77!#*Ks$CE+nL^`qmM>XxyJt;`GG&YvU8GWl zXWOUOusa_6;-k#&r;?VI$~7&K7yJwBE*0;tsAXe?>&kZ&0U3eNun4b&TF?2!NF_6+ zwZ3+uU9K5+2Ekw#M00 zd!wsq8NhUKa;NNnF!rLy2mZT|S)35gD`Bxk>i2|JJO>8+PwKymjNkajzJY z?RjfM;n0pe@~`@OpO)v1z2WQIvQBnsu}voeu6Fw=J>x2`B=?mjAG|oDV$tt;C)H(N z^vOb0b>EkD2&)PMnmc#D%Dg)5bz^(| zrfucjv%{zv38%)WQWtlWMIGA|wz-w`*;O9s(Z6`tjCg-bfurP!zU|PsR@?TSry44b zSDn2x^ p$-CM1w1K^|Q&k{eeSYqcp^VIz_aX}VdxBm6uUKUqwokq!{~u+u#cKcn literal 0 HcmV?d00001 diff --git a/res/drawable/data_sweep_limit.xml b/res/drawable/data_sweep_limit.xml index cfdbfbbc771..eba023ffa83 100644 --- a/res/drawable/data_sweep_limit.xml +++ b/res/drawable/data_sweep_limit.xml @@ -14,10 +14,6 @@ limitations under the License. --> - - - - + + diff --git a/res/drawable/data_sweep_warning.xml b/res/drawable/data_sweep_warning.xml index 8fbe8e74ae8..5c0a1e9f9b3 100644 --- a/res/drawable/data_sweep_warning.xml +++ b/res/drawable/data_sweep_warning.xml @@ -14,10 +14,6 @@ limitations under the License. --> - - - - + + diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml index 9f5ae5535a6..83d88e0a4b4 100644 --- a/res/layout/app_percentage_item.xml +++ b/res/layout/app_percentage_item.xml @@ -18,14 +18,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:paddingTop="8dip" - android:paddingBottom="8dip" + android:paddingTop="14dp" + android:paddingBottom="14dp" android:columnCount="3"> + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:textColor="?android:attr/textColorSecondary" /> diff --git a/res/layout/data_usage_app_title.xml b/res/layout/data_usage_app_title.xml index 272d8f20fff..2b5e26cb4f4 100644 --- a/res/layout/data_usage_app_title.xml +++ b/res/layout/data_usage_app_title.xml @@ -14,10 +14,24 @@ limitations under the License. --> - + android:layout_height="wrap_content"> + + + diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml index 76cfc6d5261..2f9d962325b 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -14,65 +14,48 @@ limitations under the License. --> + + android:paddingLeft="?android:attr/listPreferredItemPaddingStart" + android:paddingRight="40dp" + android:paddingTop="16dp" + android:paddingBottom="24dp"> + android:paddingBottom="24dp" + android:textColor="?android:attr/textColorPrimary" + android:textAppearance="@android:style/TextAppearance.Material.Caption" + settings:borderDrawable="@drawable/data_grid_border" /> + settings:strokeColor="#00000000" + settings:fillColor="#ff009688" + settings:fillColorSecondary="#ff80cbc4" + settings:safeRegion="3dp" /> - - - - + settings:strokeColor="#00000000" + settings:fillColor="#ff009688" + settings:fillColorSecondary="#ff009688" + settings:safeRegion="3dp" /> + settings:labelColor="#ff37474f" + settings:safeRegion="4dp" /> + settings:labelColor="#fff4511e" + settings:safeRegion="4dp" /> diff --git a/res/drawable/data_sweep_right.xml b/res/layout/data_usage_cycle_item.xml similarity index 53% rename from res/drawable/data_sweep_right.xml rename to res/layout/data_usage_cycle_item.xml index cbe2a85f38f..015608d2b8e 100644 --- a/res/drawable/data_sweep_right.xml +++ b/res/layout/data_usage_cycle_item.xml @@ -1,5 +1,5 @@ - - - - - - + diff --git a/res/drawable/data_sweep_left.xml b/res/layout/data_usage_cycle_item_dropdown.xml similarity index 52% rename from res/drawable/data_sweep_left.xml rename to res/layout/data_usage_cycle_item_dropdown.xml index 3532cbc7451..a900521d806 100644 --- a/res/drawable/data_sweep_left.xml +++ b/res/layout/data_usage_cycle_item_dropdown.xml @@ -1,5 +1,5 @@ - - - - - - + diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml index 02aa567cab2..45143ecef3c 100644 --- a/res/layout/data_usage_cycles.xml +++ b/res/layout/data_usage_cycles.xml @@ -15,22 +15,30 @@ --> - - + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:orientation="horizontal"> + android:layout_gravity="center_vertical" + android:paddingLeft="0dp" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:textColor="?android:attr/textColorPrimary" /> + + diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml index 3bca030e1cb..914e8ca4cb9 100644 --- a/res/layout/data_usage_detail.xml +++ b/res/layout/data_usage_detail.xml @@ -18,6 +18,7 @@ android:id="@+id/app_detail" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingTop="4dp" android:orientation="vertical" android:visibility="gone"> @@ -26,82 +27,107 @@ android:layout_height="wrap_content" android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd" + android:layout_marginBottom="16dip" android:orientation="horizontal"> + + - - - + android:layout_height="wrap_content"> + + + - - - - - + android:layout_height="wrap_content"> + + + - - -