From 6ccd7a59c68a2c42edb15e96fe34090c94b9ef1d Mon Sep 17 00:00:00 2001
From: Peter Ng <petergng@google.com>
Date: Mon, 22 Aug 2011 16:58:43 -0700
Subject: [PATCH] Updated background assets for notifications.

  - Replaced diagonal lines tile for notification icon backgrounds
  - Switched tablet ticker background to use same assets as icon bg
  - Flat #191919 behind notifications
  - Changed date in windowshade (no longer bold)

Change-Id: I2cc260f99e57566160630118b04fbb72274f62f3
---
 .../notify_panel_notification_icon_bg.png     | Bin 1027 -> 107 bytes
 .../notify_panel_notification_icon_bg.png     | Bin 636 -> 98 bytes
 .../notify_panel_notification_icon_bg.png     | Bin 1409 -> 138 bytes
 ...notify_panel_notification_icon_bg_tile.xml |  21 ++++++++++++++++++
 .../status_bar_latest_event_content.xml       |   2 +-
 .../drawable-hdpi/status_bar_ticker_tile.png  | Bin 107 -> 0 bytes
 .../drawable-mdpi/status_bar_ticker_tile.png  | Bin 98 -> 0 bytes
 .../drawable-xhdpi/status_bar_ticker_tile.png | Bin 138 -> 0 bytes
 .../drawable/status_bar_ticker_background.xml |   2 +-
 .../res/layout/status_bar_expanded.xml        |   9 ++++----
 .../SystemUI/res/layout/status_bar_icon.xml   |   4 ++--
 .../layout/status_bar_notification_row.xml    |   5 +++--
 packages/SystemUI/res/values-hdpi/dimens.xml  |   8 +++++++
 packages/SystemUI/res/values/colors.xml       |   5 +++--
 packages/SystemUI/res/values/dimens.xml       |   3 +++
 15 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 core/res/res/drawable/notify_panel_notification_icon_bg_tile.xml
 delete mode 100644 packages/SystemUI/res/drawable-hdpi/status_bar_ticker_tile.png
 delete mode 100644 packages/SystemUI/res/drawable-mdpi/status_bar_ticker_tile.png
 delete mode 100644 packages/SystemUI/res/drawable-xhdpi/status_bar_ticker_tile.png

diff --git a/core/res/res/drawable-hdpi/notify_panel_notification_icon_bg.png b/core/res/res/drawable-hdpi/notify_panel_notification_icon_bg.png
index f5b762ecf37ef305796231a65edda72bccfb5b4d..6f37a22d55ced9cc2f0ce6bc5643ca2d8d5a3794 100644
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3MxHK?AsXkC1&%NXxm}B3mFx&%
zR{;|3i$wNYwFEW2THw_g$R6ai#Hu8}mrbnhI0HjjlL70t=P@Ec-3*?telF{r5}E)f
CP8`|*

literal 1027
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgex0vK1^zWIfLftlUY#WAGf*4vxD*}{PmZ4a#<n*^?oxMEfp
zx<TR5^JA?}*Y*D9{!<gz+a)ZbRU)|Is0nY!g3wzgz1@|ERgSiLil4W98_dD`GA4b&
z@_e=8?H@nA-EHo`{eyK6`#T2x21NrVsROPLls||@u&-leUZsEg=NqjLYglF-klP@w
zug83R;{&Dwj+|rJ{EvSm&dFhXarAJR*={Bt?gaa~pS20RJ4Crnk`BsmoUQvHP{*X}
zxZQ`dWqP;S`nVrB_Z(l%&>XRWv!ucQK=A{|IVmQEciP^r)L|{KcFQyr(@qXIZ@hoN
zHbK+RspdUn^ntG*wr#%679e&Y_(9qmi7Sh@FvqaT9e0xr><<$E;rG?<`nI{Z|LM%!
z*JPe-UcSODv$JZ-tc?%c-aOlX?83MIx$G}QuDlQ4*<0}L8~=tVgId<}xh=)prg!{q
z5c|;j>T$52a*fy<N5-1I!V|eI=bL0j50v#d=PA$GEz8g=RN-4IJ@+=p^BnF48jY*3
z*e2U}-4$MJ(h(@Ny>Ig3k`(LBcUgZ;PM!i(lK0zTJI911bxZ!T+CPR{+(Ta#Nj<!i
zE4?Eq;BWJS@~*&Bg@1xKXdkI<DBe>1W#^W27da!IXDlr36N`SHv9Ywz?|_wi_uAqu
z7a-IPFjc~I%`z%u?&71@EUg${%jgbEUEZ8`mabaZEzB)<tcm?V?W;hkBkSG;#kx#;
zy#7F0nY9vM1=F1wH#TyAtkJHsD}8LR@rBt2H`}&tn<E+iF)7v8&EF;U>lH9>sFt`!
zl%yn<q*^5xr2;7iBLhQ2T?0d1L(33DQ!67wD^qh_0}Cqy15YnjP!2<A$jwj5OsmAL
z!9sj5Fw-$ef@}!RPb(=;EJ|f?Ovz75Rq)JBOiv9;O-!jQJeg_(RK(!v>gTe~DWM4f
DE?&2!

diff --git a/core/res/res/drawable-mdpi/notify_panel_notification_icon_bg.png b/core/res/res/drawable-mdpi/notify_panel_notification_icon_bg.png
index f0bdfb0a4c4ee4ac6037445d7afe48b82bbf96f3..c286875aa70b7dc76460345141cd374e00f929f3 100644
GIT binary patch
literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11SGd?VUh(>nw~C>AsXkC1zebf+^+rD$#X=T
ubrO(hU8NSJ>0$cOOHfbp>r;adstnf>t?m8`i{1okV(@hJb6Mw<&;$T84jPpJ

literal 636
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}A=D7{B`bBY}Z|vBA^DF{I+w+uOVS?gWUiUND`Oc}Tm(B+;pV
z!5RG}XSaWxn8?;OL2;(TVeQuU9fGV)kG#aQcW>U}U%c(@ZYlqLe=Yv@)&J;Rf5SA!
zIOY+H?K}5r)`t`0^Uj^VkS4k7sHolI!^+c?Py2pcs4s1G;JDC?hvt178rlD7I>)<B
zxqWm=eC{HiyVDl>r)D(m&vv#}K7IH5)3mSaZ0_Iqb>SZO?ArdFmU_FlmM?v}EbEEb
zjrXV3#CXj^O|MJ#b?j}My=vy=$2SUGOzwuX-jU7QwW;OW>{SzYAIni)ytHigs;RpV
zZ27EmFbt^dcGX&z`_7B=&$>1#9rQ2|>S1whnwX$+qat`>!qONO4WNMXL5~0x2~M}B
zUUN~-uv6qKysB#PU1jmrpF8Tb?o2)Y^pL`_jZexX?COGZroOd#Fun1pbldA&A6EZl
z+~z)o`9GuK>9sdM#?Ju7lxm4<L`h0wNvc(HQ7VvPFfuSS)HN{EHL?sbG`BJ^vNAE&
zH2^XU9_NQ$MbVI(pOTqYiCe=Yqj#A=4U!-mg7ec#$`gxH85~pclTsBta}(23gHjVy
VDhp4h+5i<Xc)I$ztaD0e0sty<`}6<+

diff --git a/core/res/res/drawable-xhdpi/notify_panel_notification_icon_bg.png b/core/res/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
index 4cc515ef63582b2354cf263d4b344791bce45f4a..9128e62bbcf153291e88879f1bc379b2607e578d 100644
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1SGcvS$+jlfu1goAs)w*1&;8l^sLdGn7Ux%
zPKQa2ZqJg;XK6i4GMp9lY>~9DYjI%DvUNK-7O%|HyOI$#gWG79+p|YL*B9?BG%@dc
mcI@IEi&@g{#g9*%?Pd7+{emJFN52cua0X9TKbLh*2~7aX12YEz

literal 1409
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE<hRxemd{22U45`9+AaB
z+5?Q;PG;MI1j`B>(}8pY7#ln^oW;Pv((38r7*cWT?XA06(%~Ww4^=Z`v;)^1EBxoh
znd>aSU_$td-1%$IhrWo__f}MyFs12rXYA5Vi|5D9sa>SWyI1OP<6a&{<^FwwDaO%K
zYfpB|*Zq;RU|V)z{sI33=?97*XeThg(XbCrVBEt}#~OBk`vK34BO9ytKHF>gLHENN
z?muetY8Z8x_X?}uV&2U7Lu^Oae*K2U7Ht;KICk)@zn*<*x484hw@F6-q#XJie;<fV
zkiMaEV1M$hvIEZzGe29TRa{#AA*?F5I@ZTko;|nG-B7jqfiuqu_5|OZPBBdC2Q)vZ
z$gNkuef0k8!WUcLmL51i#ryc;ALTOY3Vvq&FDpfzKb6kOkyF1NsAoLc;-vn^JI6mZ
zeYy2@#d}7vDc&cF3{ofm_^VsschkJ|lHa4Bw=Hh^?wQeDu}5zC^=0AhnU{{ToK5Cv
zt8SjLBD`?Z!@kD<?`D|G+;hGnz7#0mf4}^I@u}40)62`xgxdV%`Jp6tpUvowVfe=z
z!vE^iUv7OEEBv1ERr*oex9@fK7Vfdz^I5Oq*Un8>=Pos0S1$PfeYf7c3%|}?lD>Ys
zeft{oCbKECxpaXlKkiAb@V7oCyYRkd`4qj(;`Eoj@9#3+D?jkMp=`_U&0q44-!3_j
zKV`P#>4QrgqpiK)PutV?iS?jN1%u7fvmmp#cPh>-J5WC5^eMw!uz8$M7ysYVZGY%t
zTEJ;*?|hkj-<^_M*2y#5fBjoH87Lr<@A~t}_3P0GMKel)w!Pllt+?Z*Ma;M8dy!R-
zt2Tc)w~JwYW;IAgS0nO9W-b2)t{0Qc%BS7?agXUnsi9~s595}dAcyVV#(CzgZw^y&
zRq2czrpZ-bD`p=!GS4?5Y5j3EgRSYpGwy8W^m%ua<rNG)`vO!}ZPs|wcJ_fMK!ru;
z)eLr;9|kL4kuD5GGwuPkyt<mW2}C~5WfBIe?%XRk`@j{La<DR};>!^8)xIMcdyfaK
zc)>hhAWEnL+ORUb{UnI&-_Ggt<|d2Ux2hbbV1z3mDnW|<K+Zup8)B?6L~)f_BM`j=
zI($i-tQv^4y{Bfd5vcmc>y4Z~Z-M4QT>()EBrTDB2{ZQW2C!mCkSqgfp<>`&Tg`i7
zNw@mF#cx^?jotqI(^Jbh|FG=i@#>R>i%dVvD^i_#)M4%`)0eqP9t}m>KW5M9+AZ_V
zZLj%;Wi{SA7QdO%J|%zR3SklT9SdsK#T=b-_xb(ag>lyRHgKnK)p-7td!V7V#_4P9
zGx;fD4_Y=QXW4J)O<wl#d+{mN=Z<?eB%j*tzxUgoe*6Cn?=9y9w681p3M`paOI#yL
zQW8s2t&)pUffR$0fuW(Uftjw6Wr(4<m4T6!iLtH$kYVsRKkO=shTQy=%(P0}8YUUN
z%LHnW1lbUrpH@<ySd_}(n3A8As^FQMn4TJxnwU~qcrw)nsEEPS)z4*}Q$iB}4AqTx

diff --git a/core/res/res/drawable/notify_panel_notification_icon_bg_tile.xml b/core/res/res/drawable/notify_panel_notification_icon_bg_tile.xml
new file mode 100644
index 0000000000000..fa3c3989491ba
--- /dev/null
+++ b/core/res/res/drawable/notify_panel_notification_icon_bg_tile.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tileMode="repeat"
+    android:src="@android:drawable/notify_panel_notification_icon_bg"
+    />
diff --git a/core/res/res/layout/status_bar_latest_event_content.xml b/core/res/res/layout/status_bar_latest_event_content.xml
index 0dc67413bb094..ec1bc81ce0bed 100644
--- a/core/res/res/layout/status_bar_latest_event_content.xml
+++ b/core/res/res/layout/status_bar_latest_event_content.xml
@@ -6,7 +6,7 @@
     <ImageView android:id="@+id/icon"
         android:layout_width="@dimen/notification_large_icon_width"
         android:layout_height="@dimen/notification_large_icon_height"
-        android:background="@drawable/notify_panel_notification_icon_bg"
+        android:background="@android:drawable/notify_panel_notification_icon_bg_tile"
         android:scaleType="center"
         />
     <include layout="@layout/status_bar_latest_event_content_large_icon" 
diff --git a/packages/SystemUI/res/drawable-hdpi/status_bar_ticker_tile.png b/packages/SystemUI/res/drawable-hdpi/status_bar_ticker_tile.png
deleted file mode 100644
index 3b826a9af08a859910b410756a5bdf65cfff17ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1SBVD?P>#3MxHK?AsXkCCmdlY67!2-mFx&%
zR{;|3i$wNYwFEW2THw_g$R6ai#Hu8}mrbnhI0HlOQ^%Vo)#=SZ-3*?telF{r5}E)(
CA|1^D

diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_ticker_tile.png b/packages/SystemUI/res/drawable-mdpi/status_bar_ticker_tile.png
deleted file mode 100644
index 999959802b485549e84886fea546b8dcd7a473bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11SGd?VUh(>nw~C>AsXkCC%7;biTVB5$#X=T
ubrO(hU8NSJ>0$cOOHfbp>r;adstlsv{Yw)xV`6}s7(8A5T-G@yGywoJ#u^>~

diff --git a/packages/SystemUI/res/drawable-xhdpi/status_bar_ticker_tile.png b/packages/SystemUI/res/drawable-xhdpi/status_bar_ticker_tile.png
deleted file mode 100644
index 6585ad66f01ef8d6fb6a2dec7dd16ae85954a0b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1SGcvS$+jlfu1goAs)w*Cmi8@qBBQhV(Nm4
zI~^u9x;;xWpQZII$#7QGvqjRruEl{p%hv7WSiCY%?@C703~r-YZqFY1TwlDi(8Rp&
n*|CdvEM`f&7e796wwGc0E2VSMQ9X7*!x=nX{an^LB{Ts56|yt{

diff --git a/packages/SystemUI/res/drawable/status_bar_ticker_background.xml b/packages/SystemUI/res/drawable/status_bar_ticker_background.xml
index 83524a6581340..7cb64c0160507 100644
--- a/packages/SystemUI/res/drawable/status_bar_ticker_background.xml
+++ b/packages/SystemUI/res/drawable/status_bar_ticker_background.xml
@@ -17,5 +17,5 @@
 <bitmap
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:tileMode="repeat"
-    android:src="@drawable/status_bar_ticker_tile"
+    android:src="@*android:drawable/notify_panel_notification_icon_bg"
     />
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index b63afbe71f764..b5274a3cd0759 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -28,14 +28,15 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="55dp"
+        android:layout_height="52dp"
         android:paddingTop="3dp"
         android:paddingBottom="5dp"
         android:paddingRight="3dp"
         >
         <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"
             android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
-            android:textColor="@android:color/holo_blue_bright"
+            android:textColor="@android:color/holo_blue_light"
+            android:textStyle="normal"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
@@ -77,7 +78,7 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="3dp"
+        android:layout_height="2dp"
         android:background="@drawable/status_bar_hr"
         />
 
@@ -92,7 +93,7 @@
             android:textAppearance="@android:style/TextAppearance.Large"
             android:padding="8dp"
             android:layout_gravity="top"
-            android:gravity="center"
+            android:gravity="left"
             android:text="@string/status_bar_no_notifications_title"
             />
 
diff --git a/packages/SystemUI/res/layout/status_bar_icon.xml b/packages/SystemUI/res/layout/status_bar_icon.xml
index 21d606f0db941..d2ebf9e8a4390 100644
--- a/packages/SystemUI/res/layout/status_bar_icon.xml
+++ b/packages/SystemUI/res/layout/status_bar_icon.xml
@@ -19,7 +19,7 @@
 -->
 
 <!-- The icons are a fixed size so an app can't mess everything up with bogus images -->
-<!-- TODO: the icons are hard coded to 25x25 pixels.  Their size should come froem a theme -->
+<!-- TODO: the icons are hard coded to 25x25 pixels.  Their size should come from a theme -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" 
     android:layout_width="25dp" 
     android:layout_height="25dp"
@@ -43,4 +43,4 @@
         android:textStyle="bold"
         />
 
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml
index ca584abac0520..d627dc4e42505 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_row.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml
@@ -32,13 +32,14 @@
         android:layout_alignParentRight="true"
         android:focusable="true"
         android:clickable="true"
+        android:background="@drawable/notification_item_background_color"
         />
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="@dimen/notification_divider_height"
         android:layout_alignParentBottom="true"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="@drawable/status_bar_notification_row_background_color"
         />
 
 </RelativeLayout>
diff --git a/packages/SystemUI/res/values-hdpi/dimens.xml b/packages/SystemUI/res/values-hdpi/dimens.xml
index 741b75a55a6a2..287e0d162dd89 100644
--- a/packages/SystemUI/res/values-hdpi/dimens.xml
+++ b/packages/SystemUI/res/values-hdpi/dimens.xml
@@ -21,4 +21,12 @@
     <dimen name="recents_thumbnail_bg_padding_top">7px</dimen>
     <dimen name="recents_thumbnail_bg_padding_right">6px</dimen>
     <dimen name="recents_thumbnail_bg_padding_bottom">6px</dimen>
+
+    <!-- thickness (height) of each notification row, including any separators or padding -->
+    <!-- Note: this is 64dip + 1px divider = 97px. -->
+    <dimen name="notification_height">97px</dimen>
+
+    <!-- thickness (height) of dividers between each notification row; see math for
+         notification_height above -->
+    <dimen name="notification_divider_height">1px</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index fd5fe7a487926..5d14fa8e96985 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -18,8 +18,9 @@
 -->
 <resources>
     <drawable name="notification_number_text_color">#ffffffff</drawable>
-    <drawable name="notification_item_background_color">#ff000000</drawable>
+    <drawable name="notification_item_background_color">#ff111111</drawable>
     <drawable name="ticker_background_color">#ff1d1d1d</drawable>
-    <drawable name="status_bar_background">#000000</drawable>
+    <drawable name="status_bar_background">#ff000000</drawable>
     <drawable name="status_bar_recents_background">#b3000000</drawable>
+    <drawable name="status_bar_notification_row_background_color">#ff000000</drawable>
 </resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index ef9b8ddbd9cfe..6db5fc4945634 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -60,4 +60,7 @@
 
     <!-- gap on either side of status bar notification icons -->
     <dimen name="status_bar_icon_padding">0dp</dimen>
+
+    <!-- thickness (height) of dividers between each notification row -->
+    <dimen name="notification_divider_height">1dp</dimen>
 </resources>