diff options
author | Daniel Sandler <dsandler@google.com> | 2010-08-05 16:18:42 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@google.com> | 2010-08-10 16:19:33 -0400 |
commit | dfa08db1652585a8cf27f929371c7ca6bf18ca60 (patch) | |
tree | d5aa01b76f830566730181d8ae8da91428577547 /packages/SystemUI/res | |
parent | ff68468f1b5928c7bc1e68824bae0530830a7a1f (diff) | |
download | frameworks_base-dfa08db1652585a8cf27f929371c7ca6bf18ca60.zip frameworks_base-dfa08db1652585a8cf27f929371c7ca6bf18ca60.tar.gz frameworks_base-dfa08db1652585a8cf27f929371c7ca6bf18ca60.tar.bz2 |
Incremental system bar improvements.
- scrolling list of notifications
- fixed crashes when inserting notifications
- new "expand" icon in prep for different touch behavior on
notification icons
- adjustments to the Ticker API in preparation for Kicker
work
Change-Id: I18908cbb2bbbfb7969c7bb48dbda67697732c438
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/status_bar_expand_default.png | bin | 0 -> 1790 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/status_bar_expand_pressed.png | bin | 0 -> 4328 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/status_bar_expand_default.png | bin | 0 -> 1426 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/status_bar_expand_pressed.png | bin | 0 -> 2265 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable/status_bar_expand.xml | 21 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-xlarge/status_bar.xml | 129 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-xlarge/status_bar_center.xml | 53 | ||||
-rw-r--r-- | packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml | 28 |
8 files changed, 132 insertions, 99 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/status_bar_expand_default.png b/packages/SystemUI/res/drawable-hdpi/status_bar_expand_default.png Binary files differnew file mode 100644 index 0000000..92fc7f8 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/status_bar_expand_default.png diff --git a/packages/SystemUI/res/drawable-hdpi/status_bar_expand_pressed.png b/packages/SystemUI/res/drawable-hdpi/status_bar_expand_pressed.png Binary files differnew file mode 100644 index 0000000..77f09ac --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/status_bar_expand_pressed.png diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_expand_default.png b/packages/SystemUI/res/drawable-mdpi/status_bar_expand_default.png Binary files differnew file mode 100644 index 0000000..4d19717 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/status_bar_expand_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_expand_pressed.png b/packages/SystemUI/res/drawable-mdpi/status_bar_expand_pressed.png Binary files differnew file mode 100644 index 0000000..830cbd5 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/status_bar_expand_pressed.png diff --git a/packages/SystemUI/res/drawable/status_bar_expand.xml b/packages/SystemUI/res/drawable/status_bar_expand.xml new file mode 100644 index 0000000..f966920 --- /dev/null +++ b/packages/SystemUI/res/drawable/status_bar_expand.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/status_bar_expand_pressed" /> + <item android:drawable="@drawable/status_bar_expand_default" /> +</selector> + diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml index 9ae2c25..ffb1571 100644 --- a/packages/SystemUI/res/layout-xlarge/status_bar.xml +++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml @@ -39,13 +39,13 @@ android:onClick="notificationIconsClicked" android:background="@drawable/status_bar_icon_tray" > - <view + <ImageView class="com.android.systemui.statusbar.tablet.NotificationIconArea$MoreView" - android:id="@+id/more" + android:id="@+id/expand" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:src="@drawable/stat_notify_more" - android:layout_marginLeft="10dip" + android:layout_height="wrap_content" + android:src="@drawable/status_bar_expand" + android:onClick="notificationIconsClicked" /> <view class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout" @@ -64,39 +64,47 @@ </com.android.systemui.statusbar.tablet.NotificationIconArea> - <RelativeLayout android:id="@+id/systemInfo" - android:layout_width="200dip" + <LinearLayout android:id="@+id/ticker" + android:layout_width="300dip" android:layout_height="match_parent" - android:layout_centerHorizontal="true" - android:clickable="true" - android:onClick="systemInfoClicked" + android:paddingLeft="6dip" + android:animationCache="false" + android:layout_alignLeft="@id/notificationIcons" + android:layout_alignTop="@id/notificationIcons" + android:orientation="horizontal" + android:visibility="gone" > - <com.android.systemui.statusbar.Clock - android:id="@+id/clock" - android:textAppearance="@*android:style/TextAppearance.StatusBar.Icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:singleLine="true" - android:textSize="16sp" - android:textStyle="bold" - android:padding="6dip" - /> - <ImageView + <ImageView android:id="@+id/tickerIcon" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/clock" - android:layout_centerVertical="true" - android:src="@drawable/dots_empty" + android:layout_height="match_parent" + android:layout_marginRight="8dip" /> - <ImageView - android:layout_width="wrap_content" + <com.android.systemui.statusbar.TickerView android:id="@+id/tickerText" + android:layout_width="0dip" + android:layout_weight="1" android:layout_height="wrap_content" - android:layout_toRightOf="@id/clock" - android:layout_centerVertical="true" - android:src="@drawable/dots_full" - /> - </RelativeLayout> + android:paddingTop="2dip" + android:paddingRight="10dip"> + <TextView + android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + /> + <TextView + android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + /> + </com.android.systemui.statusbar.TickerView> + </LinearLayout> + + <include layout="@layout/status_bar_center" + android:layout_width="100dip" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + /> <com.android.systemui.statusbar.KeyButtonView android:id="@+id/back" android:layout_width="wrap_content" @@ -125,60 +133,5 @@ android:src="@drawable/status_bar_home" systemui:keyCode="3" /> - -<!-- - - <LinearLayout android:id="@+id/ticker" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingLeft="6dip" - android:animationCache="false" - android:orientation="horizontal" > - <ImageSwitcher android:id="@+id/tickerIcon" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginRight="8dip" - > - <com.android.systemui.statusbar.AnimatedImageView - android:layout_width="25dip" - android:layout_height="25dip" - /> - <com.android.systemui.statusbar.AnimatedImageView - android:layout_width="25dip" - android:layout_height="25dip" - /> - </ImageSwitcher> - <com.android.systemui.statusbar.TickerView android:id="@+id/tickerText" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:paddingTop="2dip" - android:paddingRight="10dip"> - <TextView - android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - /> - <TextView - android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - /> - </com.android.systemui.statusbar.TickerView> - </LinearLayout> - - <com.android.systemui.statusbar.DateView android:id="@+id/date" - android:textAppearance="@*android:style/TextAppearance.StatusBar.Icon" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:singleLine="true" - android:gravity="center_vertical|left" - android:paddingLeft="6px" - android:paddingRight="6px" - android:background="@drawable/status_bar_background" - /> ---> </RelativeLayout> diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_center.xml b/packages/SystemUI/res/layout-xlarge/status_bar_center.xml new file mode 100644 index 0000000..dc2357f --- /dev/null +++ b/packages/SystemUI/res/layout-xlarge/status_bar_center.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 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. +--> + +<!-- Center of status bar: System info display, system info panel trigger --> +<RelativeLayout android:id="@+id/systemInfo" + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + android:layout_width="100dip" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:clickable="true" + android:onClick="systemInfoClicked" + > + <com.android.systemui.statusbar.Clock + style="@*android:style/TextAppearance.StatusBar.Icon" + android:id="@+id/clock" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textSize="16sp" + android:textStyle="bold" + android:padding="2dip" + /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/clock" + android:src="@drawable/dots_empty" + /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_below="@id/clock" + android:src="@drawable/dots_full" + /> +</RelativeLayout> + + diff --git a/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml b/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml index 84a718a..3489eec 100644 --- a/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml +++ b/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml @@ -46,17 +46,23 @@ android:background="@android:drawable/divider_horizontal_dark" /> - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" + <ScrollView + android:id="@+id/notificationScroller" android:layout_height="wrap_content" - android:gravity="center_horizontal|bottom" - android:animationCache="false" - android:orientation="vertical" - android:background="@drawable/status_bar_background" - android:clickable="true" - android:focusable="true" - android:descendantFocusability="afterDescendants" + android:layout_width="match_parent" > - </LinearLayout> + <LinearLayout + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal|bottom" + android:animationCache="false" + android:orientation="vertical" + android:background="@drawable/status_bar_background" + android:clickable="true" + android:focusable="true" + android:descendantFocusability="afterDescendants" + > + </LinearLayout> + </ScrollView> </LinearLayout> |