diff options
author | Adam Powell <adamp@google.com> | 2010-09-22 21:10:41 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 21:10:41 -0700 |
commit | 37e3f49fb4b5ac23a985ab12b7951523be54b688 (patch) | |
tree | 5c21c36ce72efcac488d5d04bae7a6596fa2f4b5 | |
parent | 1c3846979a657e4e2b1f7864fa6defb65b3bbf42 (diff) | |
parent | e81894201979513de87269a21a1802da72d2b954 (diff) | |
download | frameworks_base-37e3f49fb4b5ac23a985ab12b7951523be54b688.zip frameworks_base-37e3f49fb4b5ac23a985ab12b7951523be54b688.tar.gz frameworks_base-37e3f49fb4b5ac23a985ab12b7951523be54b688.tar.bz2 |
am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Merge commit 'e81894201979513de87269a21a1802da72d2b954' into gingerbread-plus-aosp
* commit 'e81894201979513de87269a21a1802da72d2b954':
DO NOT MERGE Apply new styles to the status bar/notification shade
18 files changed, 39 insertions, 14 deletions
diff --git a/core/res/res/drawable-hdpi/stat_notify_usb_debugger.png b/core/res/res/drawable-hdpi/stat_notify_usb_debugger.png Binary files differdeleted file mode 100755 index fdf6c6c..0000000 --- a/core/res/res/drawable-hdpi/stat_notify_usb_debugger.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/stat_sys_adb.png b/core/res/res/drawable-hdpi/stat_sys_adb.png Binary files differindex aef8650..fdf6c6c 100644..100755 --- a/core/res/res/drawable-hdpi/stat_sys_adb.png +++ b/core/res/res/drawable-hdpi/stat_sys_adb.png diff --git a/core/res/res/drawable-hdpi/status_bar_item_app_background_normal.9.png b/core/res/res/drawable-hdpi/status_bar_item_app_background_normal.9.png Binary files differindex bdcb378..4fbfa4f 100644 --- a/core/res/res/drawable-hdpi/status_bar_item_app_background_normal.9.png +++ b/core/res/res/drawable-hdpi/status_bar_item_app_background_normal.9.png diff --git a/core/res/res/drawable-hdpi/status_bar_item_background_focus.9.png b/core/res/res/drawable-hdpi/status_bar_item_background_focus.9.png Binary files differindex 0876bc6..b07c7bc 100644 --- a/core/res/res/drawable-hdpi/status_bar_item_background_focus.9.png +++ b/core/res/res/drawable-hdpi/status_bar_item_background_focus.9.png diff --git a/core/res/res/drawable-hdpi/status_bar_item_background_normal.9.png b/core/res/res/drawable-hdpi/status_bar_item_background_normal.9.png Binary files differindex fa27ee4..de2f3c3 100644 --- a/core/res/res/drawable-hdpi/status_bar_item_background_normal.9.png +++ b/core/res/res/drawable-hdpi/status_bar_item_background_normal.9.png diff --git a/core/res/res/drawable-hdpi/status_bar_item_background_pressed.9.png b/core/res/res/drawable-hdpi/status_bar_item_background_pressed.9.png Binary files differindex 343e4ca..b5eab83 100644 --- a/core/res/res/drawable-hdpi/status_bar_item_background_pressed.9.png +++ b/core/res/res/drawable-hdpi/status_bar_item_background_pressed.9.png diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 61f6ba3..4cdf4f6 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -202,10 +202,12 @@ <item name="android:textStyle">bold</item> </style> <style name="TextAppearance.StatusBar.EventContent"> + <item name="android:textColor">#ff6b6b6b</item> </style> <style name="TextAppearance.StatusBar.EventContent.Title"> <item name="android:textSize">16sp</item> <item name="android:textStyle">bold</item> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> </style> <!-- Widget Styles --> diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png Binary files differindex baafed6..6d3ea9a 100644..100755 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png +++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png Binary files differindex 175197b..2646ba0 100644..100755 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png +++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png Binary files differindex ec1feff..013210c 100644..100755 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png +++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_normal_disable_focused.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png Binary files differindex c1f9a0f..24cefd4 100644..100755 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png +++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_pressed.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png b/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png Binary files differindex 0ea3f40..bedbceb 100644..100755 --- a/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png +++ b/packages/SystemUI/res/drawable-hdpi/btn_default_small_selected.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png b/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png Binary files differindex 67c8b7f..98e5487 100644 --- a/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png +++ b/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 423cf5a..a5d6885 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -21,7 +21,7 @@ <!-- android:background="@drawable/status_bar_closed_default_background" --> <com.android.systemui.statusbar.StatusBarView xmlns:android="http://schemas.android.com/apk/res/android" - android:background="@drawable/status_bar_background" + android:background="@drawable/statusbar_background" android:orientation="vertical" android:focusable="true" android:descendantFocusability="afterDescendants" @@ -108,6 +108,6 @@ android:gravity="center_vertical|left" android:paddingLeft="6px" android:paddingRight="6px" - android:background="@drawable/status_bar_background" + android:background="@drawable/statusbar_background" /> </com.android.systemui.statusbar.StatusBarView> diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index b5b1b50..a58e311 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -31,7 +31,7 @@ android:paddingTop="3dp" android:paddingBottom="5dp" android:paddingRight="3dp" - android:background="@drawable/shade_header_background" + android:background="@drawable/title_bar_portrait" > <com.android.systemui.statusbar.CarrierLabel android:layout_width="0dp" @@ -43,7 +43,7 @@ android:paddingBottom="1dp" android:paddingLeft="4dp" android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="?android:attr/textColorSecondary" + android:textColor="#ffdfdfdf" /> <TextView android:id="@+id/clear_all_button" android:layout_width="wrap_content" @@ -82,7 +82,7 @@ <TextView android:id="@+id/noNotificationsTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/title_bar_portrait" + android:background="@drawable/shade_bgcolor" android:paddingLeft="5dp" android:textAppearance="@style/TextAppearance.StatusBar.Title" android:text="@string/status_bar_no_notifications_title" @@ -91,7 +91,7 @@ <TextView android:id="@+id/ongoingTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/title_bar_portrait" + android:background="@drawable/shade_bgcolor" android:paddingLeft="5dp" android:textAppearance="@style/TextAppearance.StatusBar.Title" android:text="@string/status_bar_ongoing_events_title" @@ -105,7 +105,7 @@ <TextView android:id="@+id/latestTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/title_bar_portrait" + android:background="@drawable/shade_bgcolor" android:paddingLeft="5dp" android:textAppearance="@style/TextAppearance.StatusBar.Title" android:text="@string/status_bar_latest_events_title" diff --git a/packages/SystemUI/res/layout/status_bar_tracking.xml b/packages/SystemUI/res/layout/status_bar_tracking.xml index a2b40e6..3b9b775 100644 --- a/packages/SystemUI/res/layout/status_bar_tracking.xml +++ b/packages/SystemUI/res/layout/status_bar_tracking.xml @@ -26,11 +26,12 @@ android:paddingRight="0px" > - <com.android.systemui.statusbar.TrackingPatternView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - /> + <View + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="#ff212121" + /> <com.android.systemui.statusbar.CloseDragHandle android:id="@+id/close" android:layout_width="match_parent" @@ -42,7 +43,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:scaleType="fitXY" - android:src="@drawable/shade_handlebar" + android:src="@drawable/status_bar_close_on" /> </com.android.systemui.statusbar.CloseDragHandle> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml new file mode 100644 index 0000000..4b1fcf0f --- /dev/null +++ b/packages/SystemUI/res/values/colors.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* + * Copyright 2010, 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. + */ +--> +<resources> + <drawable name="shade_bgcolor">#ff282828</drawable> + <drawable name="notification_header_text_color">#ff969696</drawable> +</resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 816f34a4..86bcf3a 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -19,7 +19,7 @@ <style name="TextAppearance.StatusBar.Title" parent="@android:style/TextAppearance.StatusBar"> <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textStyle">bold</item> - <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textColor">@drawable/notification_header_text_color</item> </style> <style name="TextAppearance.StatusBar.IntruderAlert" |