diff options
15 files changed, 47 insertions, 12 deletions
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 Binary files differindex f5b762ecf37e..6f37a22d55ce 100644 --- a/core/res/res/drawable-hdpi/notify_panel_notification_icon_bg.png +++ b/core/res/res/drawable-hdpi/notify_panel_notification_icon_bg.png 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 Binary files differindex f0bdfb0a4c4e..c286875aa70b 100644 --- a/core/res/res/drawable-mdpi/notify_panel_notification_icon_bg.png +++ b/core/res/res/drawable-mdpi/notify_panel_notification_icon_bg.png 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 Binary files differindex 4cc515ef6358..9128e62bbcf1 100644 --- a/core/res/res/drawable-xhdpi/notify_panel_notification_icon_bg.png +++ b/core/res/res/drawable-xhdpi/notify_panel_notification_icon_bg.png 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 000000000000..fa3c3989491b --- /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 0dc67413bb09..ec1bc81ce0be 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 Binary files differdeleted file mode 100644 index 3b826a9af08a..000000000000 --- a/packages/SystemUI/res/drawable-hdpi/status_bar_ticker_tile.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_ticker_tile.png b/packages/SystemUI/res/drawable-mdpi/status_bar_ticker_tile.png Binary files differdeleted file mode 100644 index 999959802b48..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/status_bar_ticker_tile.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/status_bar_ticker_tile.png b/packages/SystemUI/res/drawable-xhdpi/status_bar_ticker_tile.png Binary files differdeleted file mode 100644 index 6585ad66f01e..000000000000 --- a/packages/SystemUI/res/drawable-xhdpi/status_bar_ticker_tile.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable/status_bar_ticker_background.xml b/packages/SystemUI/res/drawable/status_bar_ticker_background.xml index 83524a658134..7cb64c016050 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 b63afbe71f76..b5274a3cd075 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 21d606f0db94..d2ebf9e8a439 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 ca584abac052..d627dc4e4250 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 741b75a55a6a..287e0d162dd8 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 fd5fe7a48792..5d14fa8e9698 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 ef9b8ddbd9cf..6db5fc494563 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> |
