From 52c1dc2fd99eabed1914e390143d3d74799e6366 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Thu, 1 Jul 2010 16:39:39 -0400 Subject: [PATCH] buttons on the bottom Change-Id: I52184ad2752c38bcc4c7646b404f3f305e0ac4b6 --- core/res/res/values-xlarge/dimens.xml | 26 ++++++++++++++++ .../SystemUI/res/drawable/status_bar_back.xml | 21 +++++++++++++ .../res/drawable/status_bar_back_default.png | Bin 0 -> 717 bytes .../res/drawable/status_bar_back_pressed.png | Bin 0 -> 1493 bytes .../SystemUI/res/drawable/status_bar_home.xml | 21 +++++++++++++ .../res/drawable/status_bar_home_default.png | Bin 0 -> 1615 bytes .../res/drawable/status_bar_home_pressed.png | Bin 0 -> 3769 bytes .../SystemUI/res/drawable/status_bar_menu.xml | 21 +++++++++++++ .../res/drawable/status_bar_menu_default.png | Bin 0 -> 636 bytes .../res/drawable/status_bar_menu_pressed.png | Bin 0 -> 1458 bytes packages/SystemUI/res/layout/status_bar.xml | 28 ++++++++++++++++++ .../SystemUI/res/values-xlarge/colors.xml | 5 ++++ .../SystemUI/res/values-xlarge/config.xml | 25 ++++++++++++++++ packages/SystemUI/res/values/config.xml | 11 ++++++- .../systemui/statusbar/StatusBarService.java | 20 +++++++++++-- .../systemui/statusbar/StatusBarView.java | 4 ++- 16 files changed, 177 insertions(+), 5 deletions(-) create mode 100644 core/res/res/values-xlarge/dimens.xml create mode 100644 packages/SystemUI/res/drawable/status_bar_back.xml create mode 100644 packages/SystemUI/res/drawable/status_bar_back_default.png create mode 100644 packages/SystemUI/res/drawable/status_bar_back_pressed.png create mode 100644 packages/SystemUI/res/drawable/status_bar_home.xml create mode 100644 packages/SystemUI/res/drawable/status_bar_home_default.png create mode 100644 packages/SystemUI/res/drawable/status_bar_home_pressed.png create mode 100644 packages/SystemUI/res/drawable/status_bar_menu.xml create mode 100644 packages/SystemUI/res/drawable/status_bar_menu_default.png create mode 100644 packages/SystemUI/res/drawable/status_bar_menu_pressed.png create mode 100644 packages/SystemUI/res/values-xlarge/colors.xml create mode 100644 packages/SystemUI/res/values-xlarge/config.xml diff --git a/core/res/res/values-xlarge/dimens.xml b/core/res/res/values-xlarge/dimens.xml new file mode 100644 index 0000000000000..b3fdf46c6c719 --- /dev/null +++ b/core/res/res/values-xlarge/dimens.xml @@ -0,0 +1,26 @@ + + + + 50dip + + 50dip + + + diff --git a/packages/SystemUI/res/drawable/status_bar_back.xml b/packages/SystemUI/res/drawable/status_bar_back.xml new file mode 100644 index 0000000000000..92bf1478fb559 --- /dev/null +++ b/packages/SystemUI/res/drawable/status_bar_back.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/status_bar_back_default.png b/packages/SystemUI/res/drawable/status_bar_back_default.png new file mode 100644 index 0000000000000000000000000000000000000000..e6648f72652938862bd6180d6365341df8699f64 GIT binary patch literal 717 zcmV;;0y6!HP)DIBb9u@ERIr5eZXhIqZQ0um-Nd(;_AQR3xm2)o>X0 z!4kL!r{Q_gYs7W@C+u)u-HRoTMs8;CwzlTa2{Sl^M5G6c_MW! z=3|n02N&Q9ylGLw^U82HRjpmjMkiA%NNj>runorHCftSZ66l9PJzLQ_a_X?pbRuSM zO0jFt|;z++NfnR?=_g8;YNtrPGlOssU2X4GAkq!cJ{S!TiJS`6qiCIUQ2b(3OoENcmWsTI(#V8G5#YAsZt$PWB63mk)_-3BNM7zW2)tIlagGDHPY%pIVh1YMOHA^qrcu4hpiI|9qm`LvRTYv!oSk1KdxMl}I00000NkvXXu0mjf)Y(Oq literal 0 HcmV?d00001 diff --git a/packages/SystemUI/res/drawable/status_bar_back_pressed.png b/packages/SystemUI/res/drawable/status_bar_back_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..b25fba23efd834d5bdce9619b74947bfe07b96f8 GIT binary patch literal 1493 zcmV;`1uFW9P)ybhRkekW;;9g-19l-+;h%Mi4Y?5FdQ`VkQ^yU3X+1PASp-+l7gfloA6-C zKYpK_?R6eW40(ve*m#h;0HD!aCAuCY2H#X5M@p@w4Y#xvVgbbx3!f3ScQvcKN#B2Fy zic_>t8S?&g=A60uLa^fb8@b_G4-k2bep*zv6{ZFz`;HI4nSD}wp5$r4ztOm2ep&vo zesbk9?rFpuJ(_#pkK|rtU9uC4JTah*s$=@grGwhh!Q;7I+J1S1J8%AAepUI{`nGyL zSoJHoTcm>=0fWW+QLqjZ<8T@vIXb3KmyYPK4!x6oqOeD}ywSL1{$!lI zecC=(ofEF8L~{z!9Pu9jz0@4irdB0umIUymJ)<*c9R!3Mn>~`mAfY0>gO~2qDv_Z?A+!aE z;}l>T`BK;H<} zs89PCBU!?*B*9WjxSVJzND_YF5sWMBz`@xIuZaYR2v?^th=RnDLo~>dhte#R9bR;SG_xDj~p zf+-h=btr;}!HPVLNGuH@QYnwi+5yFc_=jRKiU<{0Q&oPXQt%+n!U!z#z91ywxF8Ha zj{5{D{oyQ`Uz9(`_pQ0T`T>Z}pk|bv z3&u4--az`TKxh>LYqCAT@*b?jL$yWA)?9;h%h6s zV_#a_L@2sZC?bpybQ111bi4&a+Oo%EZ6M^$F5Fc{wZ6#f0h3k&%zlKKj>4zaPpvN6 z=W25hb_=SMaW>=Z(Ip!-vk-8U$Q$He$$>Pz8XyGYmWL-~^Qbv>qu$PK2NJ_b0VV`3 zT4yTfqY&`{Gg)}9Z(JEs1>2$;s3Xh4swXW{#jp}Et=TB4EP>qC)Y`UAB$Q94>*Q}u zz)m1MA~j&`jP*_Bd$`*{2vyN69?I?3_flO^l`X1L|7`V)cg=Ak5H~UcUq_MaRzN$} zCRyFPb-yu;Y&&F@;i%v~!pubM8u@37(`+=m9X;1uY+JSjm{a!I+NC5&w^qKF7Upgr z1-d3MzhCn;Mv5kLGsLse#w&AXBNP)Q}wN5j^Qux$npG3hluv zaXTQDTyYodUyb*dKSCmS58r1|unO2ahYJV$C+GmnZq$1K){BcH&qx@Vow)Z`!>gTG zt|8QJqLDmIbxMLI?>efAx9J{r+rVU^_?Men?w3aWlhqn(%Vjo}XWoK+Gs@|k^9ivf z%p_1Vm!nYG_61{w{$de;#hqyIpr6^-a(d!_i0gbEM4Mgd2EGztQt_W1vNaJu&% vNne?!ASp-+l7gflDM$*Eg51;NZvh4XWn29B{lio800000NkvXXu0mjf%7o8R literal 0 HcmV?d00001 diff --git a/packages/SystemUI/res/drawable/status_bar_home.xml b/packages/SystemUI/res/drawable/status_bar_home.xml new file mode 100644 index 0000000000000..0011711335e0e --- /dev/null +++ b/packages/SystemUI/res/drawable/status_bar_home.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/status_bar_home_default.png b/packages/SystemUI/res/drawable/status_bar_home_default.png new file mode 100644 index 0000000000000000000000000000000000000000..ccfcb95765c8d070555307f6592884c7a7e0bcf1 GIT binary patch literal 1615 zcmV-V2C(^wP)UJ zTY_j51;IokMnolI1ft>=gD5X9Bv@lKJQ?-DSL2H$qA?hj7>NstTTnwpEXGg^jZ0J% zOr2&V(JIQyFlatH6=h8D}Fy7>sNoVGsd%m;$&-edNoiGf?{1+~#LPC6y z2g9HU!n0AxWN;O@PP7l+1>b<7N(%8Uw>1OY1#SlyfqF0tJO}oH(%B&7Lhv}a3Ao@Z zFa=x=9soVy*J>6bmd|wXAXpBLg00{aFb_Nm7J=`;G4M|%gt!*kXrzdHz~5jacm=eB z9pE!i1MUDR7+O}!m#X6NN4 z!tZ|Y7MI*&umsdqi;%J47SIYV0AEr>SHySw!AIZ&Fp)Dj7kFn{$OJ~FhZ(890PDD! zgHzmdjI**A%w|xSb|!^P0(XKZz)a4>dUi1Gz!L($1@CZ%ZsuUrT2mrUb_0Y1m z4$ueQ1~-Bl!!`snz{{Wq>;N}_Y>N9&iRl-cz*C?T90D7`e2_``Kp!juJHc_bGY7b% zA!HJG5*z?s;6*SSc&GW$ao|3%m+h?svnaA+Lh8XvKJ+kn9?Tqp2+2gy3cd$NxZLKA zL`>X=V(l&kpM!4j8o1QPdM1rvE!YnZg3Vwd$lDYmMtm;V3i`qOV8LnZiKGBB6|4sB zpciZh%fNVBLYlaY#KztOmV=x{5h@K}71+g@-whrEEfj0iPE=wwnYQ~8W_GWGPkE>b z4>iE|1B>UGushfCxeGxbJ=zBF3n-_}5HmD@&+r8Q5cJZf7r^hJ8yx4W6jxBv*^mx5 z)ZRty@ALV34rr!t$}oj3 z(WVqhL1BPmL??H$Q@v3}gR{JW19U%_&wh%2wXwZKA%B2ZX|sQ(%N3p8%}$85JQbWr z(>H~$4fIVadFCrwg&_*>j1VIF(!%8>^7}WrS6W%fkTcxQ^dPZ{;wTM^5qXw-W(zl+ zqu??7tEXrwLJUNXpXK;ojx)87268}qt{9Bf3^GqM$kcLqt>H@e7`y-unB?rC;*6X5 zfM!LYx{1pi<&)Y#ING3;4K};jXXkPj8+mUZbD28k{!6&j*J}w}qK)^JXl87vxt;?G zD5to$%x9|4>!p}&Z1Zl0>P(s{N<|6aUw{Yv+MT48KoHsxRKKY zm{=iE;WlX*y2Q~+N2XW6XJyk0G2J6^g0qbKO*L#5mu#H9So|tF&%4W~n7UCG}jYigWTj+(#To&?Is~Q@=ZidbEz$dR5S4(&sp7DN0x^%J9x7}d+@l{~|GZ=h`UobBI7;x@a(5zo+Xwee>Jc@~H| z@AXPFGCA4hy`Ige9uZebcJT5C_ic$?hr@5hrFJ zDl&X~X>5_7FghhRmSf|tCe&wG&G7pnEs2agwTfk_W%j2JjB0J_ zlzwGxgSjIo<|mDAqf{Qv)2Rd)R=zyL^c$tr?xN>=~? N002ovPDHLkV1h}W^mzaP literal 0 HcmV?d00001 diff --git a/packages/SystemUI/res/drawable/status_bar_home_pressed.png b/packages/SystemUI/res/drawable/status_bar_home_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..f91e399dd8f6c83d43ae1996fdcce115914bd87d GIT binary patch literal 3769 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 jzx&Z5JUH+5UjYUHRz + + + + + + + diff --git a/packages/SystemUI/res/drawable/status_bar_menu_default.png b/packages/SystemUI/res/drawable/status_bar_menu_default.png new file mode 100644 index 0000000000000000000000000000000000000000..2499d3e99c8859128fe328b711d3bd920d801633 GIT binary patch literal 636 zcmV-?0)zdDP)q@6_VaFL zX5&H#(J*XrG$fmen23p(h>4g;H(Rxha~!C&IH!p6AgKF>ZbU{w9jt;$y4e>!D8;LX zdpgFS5w&^0Dea~@{s|tz8F=YbWEyOOEl^XP@#<~q<6cRnoeVO{f%f$a;p>x^b_I69 zN#4k`5_t#5U;)h0H9@9ZEI9fuZC9ktQ`6D;{Cz~n`JAe>$G`}^fS>cfMfL0CCbKfl zSl*FLL{hrbagIQgArxl_d6`q39}3)R7V_j#;fCA@<*VYk&a}bc3KWy zgF|p%WFB!PM8A+X5@jYtTaWZ3j}$faoGS7ACK5~Kyd>e7i%KpItJK!T=mR(axBV1J zlH>~50W+%eS=Fvn)pD}Ef^D$>+sKqLwHi`>^GcByRJH6EP7JF%c6nkuJAy0R{k0 WuDUS$*1dTE000012kL=g9^*Y}l6(j+2M zBNfz#2q9DnQ6W)*c<4)c<&WTB;(y?c7bGMkgpf*+Pzq5CMW`W&rqDJ`lgr)t+dIsz z*FK+P-<|Ig5XE=e_`F}9-|Wo%W*k67<7N0T<0bjjKx!a0kpBq~p6}SdzEd<0{zVxJ z`Qhr$^~peT!WXrL1ejwjX0BMaFP{QJj$69%38sh@fXp&CE4-i<>K5sHtO7)iwV=sX zSl3*|5IeM-7n}+j5n_oJ&)!3+w#UZld1!~F( zFaX+)888Y0q&=3J9#dnnQUF-0p!iE&avVkx5k_OFRm6L6;LxBiXHCW;M;Nm@dtxGi zci%oj55IP|8ha$T^b<>NO6ror0sS@&Q&}|-Pzi(4)f|bhdYGDGK?e`XoHf zA$}RV^97Pk%UtKn&1>B&e5>&q>1%~Jpg~*#DPJ&1Ln}(oKxO@q3ElCpWNgGSGN8pE zOd`V&5B*>5KZ1StMaHynAt3rR6k)dBUf%3}xPFVj+Pq0&X_bJOnj~4w2zd5HbGnoe zq+3fykr7K@QF0btBihRoj(BK))BCiy|KtaKDq>+E*;6q$tuCF$Hs5T#L87-b)fGpg zJcX6JJ&Yi$pAki@t;T`(t+~eUMaLmj_K_*J9Qr@oPwfrsbL&d;8TH5%#?ro{xK5i$ zqIC@jK$@8*PfR&PnikWUmi%ohf)&)~(24x!eBZxMAiQ~^R%rkr^O73{?vH~b?}2@X zoc$-V^OjC3SpjUAQZ5uLi@c3?^GWof7)B@B>7#Q$5gAD+D-CpJngszRHO;gl4N9Vx zuR)aZ$Xuna4$IllIHYz;t*6_GzDj_$79`B@lE@WGMa5H=L!xP1GPkp5z$B6EO!h28 zG_+ZVlD!p_rYERC!_o|4+zcs=r}RcvB}35*k4wn;T%uMHagGrt@yt@^gG<}ZYfJCa z{VNmt~dWK(aF16oV zz0rEB`!NZ&OxiUeN&7*^wz2zcDz7qTS(exY?U;(H-=o7|Smt9F1tg_DbcKh37*efg zl6F~KZl!;dLMpa>fk~wpH<|ec_*d}AI}n2?nCIogd4Py0r8sqN_wGbTflETJlTciO zq0Cm+igCFs1r8;%#Ko^Fi0LcWQ$6Ak86Nt-*bk{PbjtkW!hujdV-LP~u?JtBJf*Hy z?&U?QT>>ZyqL#=dj7cq0{X|M$*3AqgAu!Uan<>hwz6#2Q;D6k-^2J#=fedkmv>vC; zy+|NNfd=6mi>_QLTL0^<22um5fz&{1AT^L0NDZV0QUm#qef}0;0O!8wEzL;o!2kdN M07*qoM6N<$f{&u5a{vGU literal 0 HcmV?d00001 diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 5fe8e79f8145a..46671495c8c7c 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -21,6 +21,7 @@ + + + + + + + + + + #000000 + + diff --git a/packages/SystemUI/res/values-xlarge/config.xml b/packages/SystemUI/res/values-xlarge/config.xml new file mode 100644 index 0000000000000..4cf5d18d118df --- /dev/null +++ b/packages/SystemUI/res/values-xlarge/config.xml @@ -0,0 +1,25 @@ + + + + + + 1 + + diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 8ea46e583a951..ac00c69ca4253 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -20,7 +20,16 @@ - + + false + + + 0 + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java index 07bcce7056bed..c9fee747f22d2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java @@ -97,6 +97,9 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks // will likely move to a resource or other tunable param at some point private static final int INTRUDER_ALERT_DECAY_MS = 10000; + static final int POSITION_TOP = 0; + static final int POSITION_BOTTOM = 0; + StatusBarPolicy mIconPolicy; CommandQueue mCommandQueue; @@ -104,6 +107,8 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks int mIconSize; Display mDisplay; + int mPosition; + StatusBarView mStatusBarView; int mPixelFormat; H mHandler = new H(); @@ -193,10 +198,11 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks } } - @Override public void onCreate() { // First set up our views and stuff. + final Resources res = getResources(); + mPosition = res.getInteger(R.integer.config_status_bar_position); mDisplay = ((WindowManager)getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); makeStatusBarView(this); @@ -349,7 +355,11 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING, PixelFormat.RGBX_8888); - lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; + if (mPosition == POSITION_TOP) { + lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; + } else { + lp.gravity = Gravity.BOTTOM | Gravity.FILL_HORIZONTAL; + } lp.setTitle("StatusBar"); // TODO lp.windowAnimations = R.style.Animation_StatusBar; @@ -365,7 +375,11 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM, PixelFormat.TRANSLUCENT); - lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; + if (mPosition == POSITION_TOP) { + lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; + } else { + lp.gravity = Gravity.BOTTOM | Gravity.FILL_HORIZONTAL; + } lp.y += height * 1.5; // FIXME lp.setTitle("IntruderAlert"); lp.windowAnimations = com.android.internal.R.style.Animation_StatusBar_IntruderAlert; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java index 95f2fe578b417..57452afd3192f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarView.java @@ -133,7 +133,9 @@ public class StatusBarView extends FrameLayout { mDate.layout(mDate.getLeft(), mDate.getTop(), newDateRight, mDate.getBottom()); mBackground.setFixedBounds(-mDate.getLeft(), -mDate.getTop(), (r-l), (b-t)); - mButtonArea.getHitRect(mButtonBounds); + if (mButtonArea != null) { + mButtonArea.getHitRect(mButtonBounds); + } } @Override