From 67ed6c7224b902ae56a109701a241210e18cf721 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Sun, 28 Aug 2011 13:21:56 -0700 Subject: [PATCH] Fix bug 5133509 - Align holo menu panel windows along the bottom of the screen Alter preferred options panel gravity policy. Integrate new menu panel assets for holo apps. Change-Id: I9fa98ed9359148ea6d1f1d1e727ddcd437b16e2f --- .../menu_hardkey_panel_holo_dark.9.png | Bin 0 -> 713 bytes .../menu_hardkey_panel_holo_light.9.png | Bin 0 -> 641 bytes .../menu_hardkey_panel_holo_dark.9.png | Bin 0 -> 486 bytes .../menu_hardkey_panel_holo_light.9.png | Bin 0 -> 474 bytes .../menu_hardkey_panel_holo_dark.9.png | Bin 0 -> 997 bytes .../menu_hardkey_panel_holo_light.9.png | Bin 0 -> 882 bytes core/res/res/values/arrays.xml | 2 ++ core/res/res/values/themes.xml | 4 ++-- .../android/server/wm/WindowManagerService.java | 12 ++++++------ 9 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 core/res/res/drawable-hdpi/menu_hardkey_panel_holo_dark.9.png create mode 100644 core/res/res/drawable-hdpi/menu_hardkey_panel_holo_light.9.png create mode 100644 core/res/res/drawable-mdpi/menu_hardkey_panel_holo_dark.9.png create mode 100644 core/res/res/drawable-mdpi/menu_hardkey_panel_holo_light.9.png create mode 100644 core/res/res/drawable-xhdpi/menu_hardkey_panel_holo_dark.9.png create mode 100644 core/res/res/drawable-xhdpi/menu_hardkey_panel_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/menu_hardkey_panel_holo_dark.9.png b/core/res/res/drawable-hdpi/menu_hardkey_panel_holo_dark.9.png new file mode 100644 index 0000000000000000000000000000000000000000..53871a0515737eef2f0540cf3749e03fa7023ed2 GIT binary patch literal 713 zcmV;)0yh1LP)?48penK5^5a?HlzmBcmiD$OtlE ze>@(4#u)#E5Z)jCZ`MfHb$?H%)9>^7{14+Bk=GE7G?zxSl(Yk|2XKfnez*x!LJ03M z#t#4o+_c(ZT2IwXQIeW?G#mgNLI}T}bLs1&*XFJNC=2*(x^DV|wPyex4fnLf{)jWr z8>R*PiouLYipq^}xEXr@Kj21`z*AF$acWYrjNo;GMn`0ZV?##p5v4hb%oS^@5i&hF zHar@rSj!oR5v38qYlRz;N1CuGHSyoM5hc?iuMU6EHHWQ4$#g^zZM*CmUjkmB%}5|h zjL=e)VVwm|1-W)jGY(OzD?LGa~o0$0H(-rkAGcotlX7v{XlxUNuHo)40x* zD!nu#m4uFUxZpCJUx|Bty75+d}#>Hu{$>O?tw3@F)1-ZE)j7f z@^B-lndIg{I<}=%3hn&iP7mosh5#8etccK3QVZa+_%hee1!E(!DQeCLKFs2aras|D vlyJdKD>CDX%#xZ%pOk&%WK*SUN(uh~2k5Q#ApwKU00000NkvXXu0mjfSVTNR literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-hdpi/menu_hardkey_panel_holo_light.9.png b/core/res/res/drawable-hdpi/menu_hardkey_panel_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a031357fce5e71e7b3d4f54657245be2d118d9 GIT binary patch literal 641 zcmV-{0)G98P)VD)lVo3LuEPfGNY^pK+2()R|ARjFUJ`-^=(Xc7@@%5$;g}Ro{xv znS_R67=~dO#=oNX*mq#vlIb-m(26OqtJpE$xhWt8cPtN`3z8D862E1V$EOGv-USlB z)=RDULnQDFSHWkVvNWb-r1%{>)_KZ6A}V4=a4~0|G#6!Gw3G^oN`g~SMY5?_a zxBF<@_GRF67s-CV|6DGYuQ(fV#C??b%y6NI;7tq}Q3F^2SeOZ6F50xXZJw#Ws95=i zT3o=99Wxoxj`q~$(%^Q~)WJWB`bFDE@Q5%Y(zLiXMJJp!>|zyWk#n+-AS0SFp0scp zoVBWP9bHC8lPM#3M35O~M4HizkdreW6`D!l)Zqq56TD_QjnQ=!dB6zui z8KFfsNu2D6ph_|_Qgw_TpM5l<%A1)HX|lh)<%l|kk9lK~rI)?k4}xaY1d&@*qzNsY z^_tM}n;L(N#t7RXJDjA3F(c%1pgd-T$=1#~>jxpn2#bb1vh>pS5pt2kh$9z*RDDEj zR3r`HI}?mBTq~6sp@{J9RHN-8a(9Ap4{aJy@A}h>n)s5R8KEPzdm|VXeJ5+yX~)UZ b)j5YBp#7bxX61>>00000NkvXXu0mjf6@MTm literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/menu_hardkey_panel_holo_dark.9.png b/core/res/res/drawable-mdpi/menu_hardkey_panel_holo_dark.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9d80b7762def125f7f35c759c2467b7dee254942 GIT binary patch literal 486 zcmV@P)c3|2s%VZHXEFb^~H`Ts^udB~XDWNmD0q-IJn zQNbw9tpO8x9ga~XAu5O>7}sV%h;ib_h6%!BFMJWj?riLB6!tw0StAtxu;bmv!v>%6 zh#5f>DE{C?Y3J5zhHJtdz&C)_31#OM0y88dm<1ZZv8t+ft@Q^wGjgJBn&z{v>o4>_ zT5NlmBJyF@f)ctL)5ZLc8DsQ_-R~Bl^dTlo758x20B>kQ;n6o|t+(=3Y1l cbsA&v3%r0}Gl8)1LjV8(07*qoM6N<$f(!=CzyJUM literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/menu_hardkey_panel_holo_light.9.png b/core/res/res/drawable-mdpi/menu_hardkey_panel_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..efa43256dfb1af903cb1abd971b7f82d2906bdc7 GIT binary patch literal 474 zcmV<00VV#4P)R9J=WmrZViFc3zc3FN0slmm2? zyY&=RPtm)v>mFqtr47>sST>HqL@G_D@Z_JcIBHCmvEG#VC ziBwiKiT;rh+%6aPR}2ZV_p|Og>>u3-@mkY0du^Zh$Rm>&udO02!x{33_~I`?v(Nn= zh#LXUgd8ZUs(RV)_ix6S^-r&QPDJEf*Y)e+aCiqkyW1D8BSKzXRm+&Qp*doi<)?+M3G_;l4d9Ky{BDU%rjEbo{g7$?AUqsltod zu$#jG*MJ+qf=h5B4#XylS+JU7l9+`g-0n!SY$tIF-dE*P{wybXFWqX{iotd0uGBAa zm`irnb(D(`LI@#*5JCtc-NqNJ~jPK5jil+N@lo)OwC*jI~cGS7`YPU55l&Iv!u z6jOyUnbu^UpK~nY=pwge+a(^?`(`PP2q|H68vs;^en=Tw$Zli{uhHN0s3E4L25E*0 zL(%KR;}y=M1}R4ie8N!p(@1Mj7!^v4phLbEx!U3SR@*0;nG!AK$fY`@U(KZvY+&`XtNw_44xa z{rUO%$9}*631<@HTc9^VFiMV2kLpwCv4Knto3?E~SZhCnCb%UJ*4j^P+kQm*J8w7-OESwO`+5Ga#*f5mxr$z$*Z_g4GmCPt zD60puE?c-tAw=xhIi4&f6H2;`MFz4isc3*mo9ti;dR~F4;XcrV#iH3n$(*V|-j>%K zko8ENTPQZeoQS~GaDT)Gh*ygUF?e0U{jf+2{+bB@8sT53I8CIC5X(2Qfg-^4a1W%k z(XUCGf)RlL7&k(0$rb;B>Hf&+GV9`1z04}Mtg7e$ZMCpb>~?su6Tp zDY<5zT%WM8ML$-|oQRNGg-h0Bu_jZDpjY7@MN8I2YN1z57cnO_=uL+ta(lG+lcU1e zdF#-bJWz1n5pLD(A-*fQAwh?ri`EMmF-A#5h}ERp5M*6q2FT6*oKd>KMG9ZTxvzq| zex6q-tY$hw5IAhk)&E=IZ3nM0P4>#|74uIumzQr`wj T3mCQ700000NkvXXu0mjfr02=H literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-xhdpi/menu_hardkey_panel_holo_light.9.png b/core/res/res/drawable-xhdpi/menu_hardkey_panel_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..92e117d41c60cb346b31615b471140579920a9bf GIT binary patch literal 882 zcmV-&1C9KNP)s4QF1FGc<1=~+B3%B zG1v#4mpIHlPi8IUB7_h^2qA$q zm4+DFCy7*XPq^+nfRRSf4A200 z1)w<|kNc)+-jshOQp)*!{yCq|S8!rKW7rU?5gO%<7-4h>x0WWTNB_U?;2LSD3y_hM zb-45&8eyX6FXk^iL)j3N+?N@yqX2M8EN_k+a+5_lLTLMq)WtVwFM6m~(#T=R2r(0Q z;k$mD!Q~00E;C$)k_Ij+0GHe#)G}&}l87LOkBkWQY2ic<=W?Z!rom_(N{v7ROp{_=7}f~@8sUFo^gKc=8>K}kdiU(*QFAT&V8-Bv@(6MFIeb8#oQ6*i@drawable/list_selector_holo_light @drawable/menu_background @drawable/menu_background_fill_parent_width + @drawable/menu_hardkey_panel_holo_dark + @drawable/menu_hardkey_panel_holo_light @drawable/menu_submenu_background @drawable/menu_selector @drawable/overscroll_edge diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 903fc047883f6..f8866f26fb7ec 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -980,7 +980,7 @@ please see themes_device_defaults.xml. @android:drawable/toast_frame_holo - @android:drawable/menu_dropdown_panel_holo_dark + @android:drawable/menu_hardkey_panel_holo_dark @android:drawable/menu_background_fill_parent_width #000 @@ -1283,7 +1283,7 @@ please see themes_device_defaults.xml. @android:drawable/toast_frame_holo - @android:drawable/menu_dropdown_panel_holo_light + @android:drawable/menu_hardkey_panel_holo_light @android:drawable/menu_background_fill_parent_width #000 diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index e258b1a45346d..192d32b1c9732 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -5291,24 +5291,24 @@ public class WindowManagerService extends IWindowManager.Stub case Surface.ROTATION_0: return Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; case Surface.ROTATION_90: - return Gravity.RIGHT | Gravity.CENTER_VERTICAL; + return Gravity.RIGHT | Gravity.BOTTOM; case Surface.ROTATION_180: - return Gravity.CENTER_HORIZONTAL | Gravity.TOP; + return Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; case Surface.ROTATION_270: - return Gravity.LEFT | Gravity.CENTER_VERTICAL; + return Gravity.LEFT | Gravity.BOTTOM; } } else { // On devices with a natural orientation of landscape switch (rotation) { default: case Surface.ROTATION_0: - return Gravity.RIGHT | Gravity.CENTER_VERTICAL; + return Gravity.RIGHT | Gravity.BOTTOM; case Surface.ROTATION_90: return Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; case Surface.ROTATION_180: - return Gravity.LEFT | Gravity.CENTER_VERTICAL; + return Gravity.LEFT | Gravity.BOTTOM; case Surface.ROTATION_270: - return Gravity.CENTER_HORIZONTAL | Gravity.TOP; + return Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; } } }