From fc753d2dfa6f1bfafce59e1a2049e640b1629a83 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Tue, 8 May 2012 13:56:44 -0400 Subject: [PATCH] More visual refresh in the phone notification panel. Bug: 6418617 Change-Id: Iae9b02084989fad3ec8bb8c88a84c0ec96fc4f22 --- .../drawable-hdpi/notification_panel_bg.9.png | Bin 0 -> 232 bytes .../drawable-hdpi/status_bar_close_off.9.png | Bin 0 -> 716 bytes .../drawable-hdpi/status_bar_close_on.9.png | Bin 3026 -> 712 bytes .../drawable-mdpi/notification_panel_bg.9.png | Bin 0 -> 211 bytes .../drawable-mdpi/status_bar_close_off.9.png | Bin 0 -> 414 bytes .../drawable-mdpi/status_bar_close_on.9.png | Bin 1565 -> 532 bytes .../notification_panel_bg.9.png | Bin 0 -> 2641 bytes .../notification_panel_bg.9.png | Bin 0 -> 1496 bytes .../notification_panel_bg.9.png | Bin 0 -> 4014 bytes .../notification_panel_bg.9.png | Bin 0 -> 2641 bytes .../notification_panel_bg.9.png | Bin 0 -> 1496 bytes .../notification_panel_bg.9.png | Bin 0 -> 4014 bytes .../notification_panel_bg.9.png | Bin 0 -> 249 bytes .../drawable-xhdpi/status_bar_close_off.9.png | Bin 0 -> 822 bytes .../drawable-xhdpi/status_bar_close_on.9.png | Bin 5166 -> 1001 bytes .../res/drawable/ic_notify_rotation.xml | 27 ++++-- .../res/drawable/status_bar_close.xml | 23 +++++ .../res/layout/status_bar_expanded.xml | 86 ++++++------------ .../res/layout/status_bar_tracking.xml | 60 ------------ .../SystemUI/res/values-sw600dp/dimens.xml | 7 +- packages/SystemUI/res/values/colors.xml | 1 - packages/SystemUI/res/values/dimens.xml | 14 ++- .../statusbar/phone/PhoneStatusBar.java | 10 +- 23 files changed, 93 insertions(+), 135 deletions(-) create mode 100644 packages/SystemUI/res/drawable-hdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-hdpi/status_bar_close_off.9.png create mode 100644 packages/SystemUI/res/drawable-mdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-mdpi/status_bar_close_off.9.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-hdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-mdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-xhdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-sw720dp-hdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-sw720dp-mdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-sw720dp-xhdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/notification_panel_bg.9.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/status_bar_close_off.9.png create mode 100644 packages/SystemUI/res/drawable/status_bar_close.xml delete mode 100644 packages/SystemUI/res/layout/status_bar_tracking.xml diff --git a/packages/SystemUI/res/drawable-hdpi/notification_panel_bg.9.png b/packages/SystemUI/res/drawable-hdpi/notification_panel_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..8a0a30f699e8dafcdf852ebee7551d7bf10e008a GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^%nS^SZX9et*7{SbSAY~tv6E*A2N2Y7q;vrJoCO|{ z#S9GGogmC;e)9BMpkSA$i(^Pc>)RO@xf&FBT+jddU%zj!M5}0sU-}~bB8P3eUxx^I zGE8b=RO(edYsGZnt5Lj#`dWsxFzpgP-&dXDQP(e?^QqB2es^w#bDjv#4fg6w3)k}+ zb8owDUa~LJUgur%{;we~Grk{uv3$wirso3x-%LB1$)T7ZHuFM-rCiw8kn=5^vdp*H bSq^Z$=hp1nvBZ`i=qd(JS3j3^P6Vpu)a9cP7lyC z_~^4Y@+@AX1Xh@53vo&y5xJD26+)nL6`ODoerq`IB#wIG(UJRbl=BTu3g zq0JqqysRU~DgyUd5lSr}dblwJz}o^d!fy+RWxRxtFnn{5xL*xC`LguYD&6?v{+Nmt> zO4_ARd-(e%c|iD=9}VCxe?Fg|4~N4m|AixjfXn4_J)KTh*g(07=mJ8L_a!;_2p}Gh z$Cv$n|0WyncDoV4$5bx|;ZkgA#3X0$>zs%&s{Kyo5<-JA{`@9GmbMm@4m<)!FV>|d%i{FZ>yFbwaT z%_afB?RE>4ABKT8I<+miR+T)fp`Fy$btCr;ky0&C$ag>;T-Tq2N+~zWo0c>Sgn!Q6 ztG*4YrnR@io$Dsu~3DS5LgEOV0MXHL7{qlr3UpL(1ZpbiRv;RR%}|6aW_HH* z*vVp{JSmDvV*9@ zlBZyPEr?VhS}aNAHOutG`lDsnHS$RbV9Xe4pbKfg@3-C>{e81FfMH{#e^JK$A-Rrp z-deE7(r<%JAwJ2TsBaa%&Zq@3R3}n`z9%mc_DS>3AW2N=_lQ&{Qma0XA8Ea0jP+r~ z->P&D%`u}?h*r#a52dvqp?M~hWG$X5Eo4KLee|s52P1Dact)broBNCT{?R!RtzE`B zN1w0Hw@=rXj~G}~jzxGYf6lJ~0L>4M&vq7jSA6pB;mHet2k0HHrR!Z|#t5atC(i3Z zx0X|uY?^+KU*#p&G$GX@lGxB^DLFWWjMH4I$i0U8cM#vKg_DK2&LR@&?2H9;LM(0- z+w7-OcZ4^w=~}6l38FOps#txz-C@x#!Mfko`_d2eY~maiYw&6vf9ks+oPo_?*6NSd zm)Z{HF#Swes?*&(u^ zHSn{A_!wdhpe$<@WxSg3e}1u=gw%#fNNt#e)P_k&ZJ31AhDk_m$oiS9GB_f_7qA)n Vii5bA5&!@I07*qo1w^hwV1jrOL)HKQ delta 3019 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 N002ovPDHLkV1hH2*?j;2 diff --git a/packages/SystemUI/res/drawable-mdpi/notification_panel_bg.9.png b/packages/SystemUI/res/drawable-mdpi/notification_panel_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..25f15e6ab3314eb0033b2f20950dfe7243ea5873 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^%s_mLgAGU~Oa6!eQY^(zo*^7SP{WbZ0pxQQctjR6 zFmQK*Fr)d&(`$i(rJgR1As(G?ryb-vpupoC|Ly<(Ik9(AdjhXSNq$yx^oY;kPLe*b zO)%k><*nQYKbN{!oNx#-Jh*DnTuo_rVOO}8AN7;j4IoT{2+ha5~{ZrR|0CWI@r>mdKI;Vst E04v2!$^ZZW literal 0 HcmV?d00001 diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_close_off.9.png b/packages/SystemUI/res/drawable-mdpi/status_bar_close_off.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4f5bba53dda99a7a1820077cc15a6842d57254f7 GIT binary patch literal 414 zcmV;P0b%}$P)k}MjI8C-KzL;hcMw8c$jCUb zM|%W>Aza$vuPronw~YK^!5eTucn-YLq34YgSB0iKBT@#qOMw|k@4VpnY26QRUvK7% zmWn;_?)XSTi|9K42SM3o&YBxUb%UsG5Y=Ts+&@77$zW!90hTF>MggGh(EtDd07*qo IM6N<$g2M)=EdT%j literal 0 HcmV?d00001 diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_close_on.9.png b/packages/SystemUI/res/drawable-mdpi/status_bar_close_on.9.png index fb3098279da97ac4e281e24c3303d0bb2aaf61c0..ef7afb831642d905f6e4ec42e888722e5529408d 100644 GIT binary patch delta 505 zcmVRiBL{Q4GJ0x0000DNk~Le0000Y0000Y2nGNE06Iqt!jT~-e*v~h zL_t(oh3%KIO2j}AhX0);m+C+QiXK?_DzprHf311MH#C477J*)gNmgf+)V-85Y{fH9gF+(#Bm^lS zXUGT$i{D|}2&5}7NDXPssy%{>UCi+f0g(VYkG2vTch#YB16cQl^Mv;5;AHI!lba`D zT)%`@I_v*Up&pS*#{f8=ozTJA)xJs73;=BPQI${gvRW;p3Rw(@1aL>ve;!`k6vgTJ zqoHI509@D4Cd;mucef>e>WO}VUJxDEE*M!YkxusvQF;WT<7Ul!IxPU8ZUGroM|5dk z1EERI65qgpCb?DXqCykeTgcD=lvH4T0h;!T`PC%JXS1d)G+vNU$qj9}xL?sEzl5O- z0J#3DR*Q$X7Kk7ipEriKPXT(aOWsz|C30WG(>5P;QlvsFUu>(`1>U(nrl7@WJpTug v;?aC-b|6|i5Um}E)@VS2e}Mjyftm3QKZd5nwfLF300000NkvXXu0mjfvJl;= delta 1546 zcmV+l2KD)r1f2{aiBL{Q4GJ0x0000DNk~Le0000&0000Y2nGNE0PCO+vXLPte+9ou zL_t(&f#q3SZ&Xzj{?<8j=`bBiC4fdMHN-Mr3qphO#iSVi0g1mrUNG@V)Y$L*8wvl zg;@OlYm~|tGlN9Oy0@)}0OsUBf9)6qr(YhyEk6RKU*dMC7Wi5TL;?h)g85CaSbfk2d$z(_!XDfv>TjQy0h`%w>nsxhRmf*IMRq&-l;5fMm$f5Pg<2`sqO z_!?3r>;AL?fDeg~#&PIm3?j1bivf_-Z8=4m4RWVD1#^!q71}=eQH|6a(zmWufD8dt z#x;!zsX7U0vY0l^my`Ddgi8__NmfksE;gff z^GdwAyb#6xo?cP~VG!PjVH+4fx{(ivA-BmYK2YvbjuVyA-u=Oor_Pjiy>_xtsEz9& zg1IR(Ge`v8U?R`2paOR_O z?UmOHTMz!?wJYBaIybLI08pJe9PWJejY4sJ53OJOK3cl){$_vmcC4aENutaaIE-w= z`$$yF2ZRwASzrW)iU?qW(g-F_pBveI;#6_t*K5(r+}U2|=6u9aB<6(JF*O}dynVi0 zoth5sefQ45=djf2R9%_I}v=r!rX&K!lB3 zS0j!yaRA3LHWub1fKZvN2iiXB5PZlEc_5DxVW=|OI!hEN*O`$Ba#s>1`7$$aJmvOP zkhOjCtQyW!T)rZ~=q@&6FrzwkIHVxVT!DfB)k8-D0O&5=h|P7($TDfldip;;`7xHF zqC_@DGCIvhe>7-6;IU(~g&ogLXChHK_;NTl^JX#XtZ}E=h+Or{l&73vTo!5`h2;xdmptL7Y7@^U61A3Y8*`U zGQ;eA#xiFd0n0*aBSv;#;ytLmcRxMz&c`FQmyU;9fA?0o)wne1+?077?ZA#VS2IqELnh~xgI)-%TgNrvq-9-J|cO*w(EQujKt)DK27 zgH9zCw)AA`Icrx*V2-V5e#i~yvk^5vsXBwyMT&%M(nuO1fI+Om7!rLk#%g2B1hDxw z$ym$@wFxt1X8R&4V`&e8xvljg%kHh95fBly*u44x$58)xw^pwswi)4VHN#`fn znaElOj3kB@5c8?6c7Xaw=PBCu1B8)h)WTsVPXsvP_|8CR5!X#5a}4qDK9-&I1VsK2 z+xmqDl6V!)S^fkOJl58)$wY%HO|*3zfdgK_p%xQGe4P-yjD|HWE7fplTM#08Lo%*LuJ3OPcv_5T_n2= w&U?XmtPQQ}Huy7=Y71rtDTn|6Bxa_60IG?vN|Vv<+yDRo07*qoM6N<$f|M=YNB{r; diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/notification_panel_bg.9.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/notification_panel_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..2ff93d34fecf25b518230353b25eea0ed75ceb2c GIT binary patch literal 2641 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 Kg5jEX9*`w}BK(v6E*A2N2Y7q;vrJoCO|{ z#S9GGogmC;e)9BMpx|sz7srr@*0(bba zSU2ppX0w=|{P?xS0sZuO>p5Fi`^n9S+{75=n56j1Z}YK;;v(*~|0VYMyq3IJ_ugl> z=aOB8r>{%C*4Vl9#h)0xq|!xqrr8@^-Tn1n0)z47Qsuq3{}cuGRq(%GqiT1;^zeL# t%I?i#TzuMPDy+>WCMFyV$Ir(%$gVu2mE3T<9t` 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 - - - - - + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/status_bar_close.xml b/packages/SystemUI/res/drawable/status_bar_close.xml new file mode 100644 index 0000000000000..2efc3c3a2030e --- /dev/null +++ b/packages/SystemUI/res/drawable/status_bar_close.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 8715a99cbfb15..f69aac8018e0b 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -25,25 +25,24 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="@drawable/notification_tracking_bg" - android:paddingTop="@*android:dimen/status_bar_height" + android:background="@drawable/notification_panel_bg" + android:paddingTop="@dimen/notification_panel_padding_top" android:layout_marginLeft="@dimen/notification_panel_margin_left" > - - + + - - - + - - diff --git a/packages/SystemUI/res/layout/status_bar_tracking.xml b/packages/SystemUI/res/layout/status_bar_tracking.xml deleted file mode 100644 index c1b00668429fd..0000000000000 --- a/packages/SystemUI/res/layout/status_bar_tracking.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 50a61b18114b6..2ff62a54d33e3 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -16,8 +16,8 @@ */ --> - - 446dp + + 478dp 192dp @@ -36,4 +36,7 @@ 300dip + + 0dp + diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 34714c4078a50..ac2779faa5ca6 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -25,7 +25,6 @@ #ffffffff #ff090909 #FF000000 - #66000000 #80000000 #99ffffff #ffaaaaaa diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 276d74bca9dc7..b908188dc8114 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -125,7 +125,19 @@ 230dip - 34dp + 32dp + + + 18dp + + + 48dp + + + @*android:dimen/status_bar_height + + + 0dp 0dp 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 1d281c50311a6..f53a2823e936c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -106,6 +106,7 @@ public class PhoneStatusBar extends BaseStatusBar { = "com.android.internal.policy.statusbar.START"; private static final boolean ENABLE_INTRUDERS = false; + private static final boolean DIM_BEHIND_EXPANDED_PANEL = false; static final int EXPANDED_LEAVE_ALONE = -10000; static final int EXPANDED_FULL_OPEN = -10001; @@ -1333,6 +1334,7 @@ public class PhoneStatusBar extends BaseStatusBar { mPile.setLayerType(View.LAYER_TYPE_NONE, null); mVelocityTracker.recycle(); mVelocityTracker = null; + mCloseView.setPressed(false); } void incrementAnim(long frameTimeNanos) { @@ -1371,6 +1373,8 @@ public class PhoneStatusBar extends BaseStatusBar { Slog.d(TAG, "panel: beginning to track the user's touch, y=" + y + " opening=" + opening); } + mCloseView.setPressed(true); + mTracking = true; mPile.setLayerType(View.LAYER_TYPE_HARDWARE, null); mVelocityTracker = VelocityTracker.obtain(); @@ -1497,8 +1501,8 @@ public class PhoneStatusBar extends BaseStatusBar { if (!mExpanded) { mViewDelta = statusBarSize - y; } else { -// mCloseView.getLocationOnScreen(mAbsPos)...? -// mViewDelta = mAbsPos[1] + mTrackingView.getHeight() - y; + mCloseView.getLocationOnScreen(mAbsPos); + mViewDelta = mAbsPos[1] + statusBarSize + getCloseViewHeight() - y; // XXX: not closeViewHeight, but paddingBottom from the 9patch } if ((!mExpanded && y < hitSize) || // @@ add taps outside the panel if it's not full-screen @@ -2011,7 +2015,7 @@ public class PhoneStatusBar extends BaseStatusBar { } mNotificationPanel.setLayoutParams(lp); - if (ActivityManager.isHighEndGfx(mDisplay)) { + if (DIM_BEHIND_EXPANDED_PANEL && ActivityManager.isHighEndGfx(mDisplay)) { // woo, special effects final int barh = getCloseViewHeight() + getStatusBarHeight(); final float frac = saturate((float)(panelh - barh) / (disph - barh));