summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2010-07-23 09:11:14 -0400
committerDaniel Sandler <dsandler@google.com>2010-07-23 14:58:40 -0400
commit9120d55b806aec981ce7c1af20b7aa3d303ccca5 (patch)
tree5686f0a3b27cb0e2e1a5360499378cf3488580e1 /packages/SystemUI/res
parente3f84a579cef158e1e767dea82e3e3014de2989d (diff)
downloadframeworks_base-9120d55b806aec981ce7c1af20b7aa3d303ccca5.zip
frameworks_base-9120d55b806aec981ce7c1af20b7aa3d303ccca5.tar.gz
frameworks_base-9120d55b806aec981ce7c1af20b7aa3d303ccca5.tar.bz2
Improvements to the system bar:
- dummy panels for the notification & system areas - dummy battery/wifi status indicators - new "whiteboard ui" temporary artwork
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/drawable/dots_empty.pngbin0 -> 811 bytes
-rw-r--r--packages/SystemUI/res/drawable/dots_full.pngbin0 -> 1257 bytes
-rw-r--r--packages/SystemUI/res/drawable/status_bar_back_default.pngbin717 -> 2372 bytes
-rw-r--r--packages/SystemUI/res/drawable/status_bar_back_pressed.pngbin1946 -> 4158 bytes
-rw-r--r--packages/SystemUI/res/drawable/status_bar_home_default.pngbin1615 -> 2369 bytes
-rw-r--r--packages/SystemUI/res/drawable/status_bar_home_pressed.pngbin4691 -> 4645 bytes
-rw-r--r--packages/SystemUI/res/drawable/status_bar_icon_tray.9.pngbin0 -> 2175 bytes
-rw-r--r--packages/SystemUI/res/drawable/status_bar_menu_default.pngbin636 -> 3172 bytes
-rw-r--r--packages/SystemUI/res/drawable/status_bar_menu_pressed.pngbin1964 -> 4532 bytes
-rw-r--r--packages/SystemUI/res/layout-xlarge/status_bar.xml67
-rw-r--r--packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml53
-rw-r--r--packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml52
12 files changed, 147 insertions, 25 deletions
diff --git a/packages/SystemUI/res/drawable/dots_empty.png b/packages/SystemUI/res/drawable/dots_empty.png
new file mode 100644
index 0000000..22ada41
--- /dev/null
+++ b/packages/SystemUI/res/drawable/dots_empty.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/dots_full.png b/packages/SystemUI/res/drawable/dots_full.png
new file mode 100644
index 0000000..2a346d6
--- /dev/null
+++ b/packages/SystemUI/res/drawable/dots_full.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/status_bar_back_default.png b/packages/SystemUI/res/drawable/status_bar_back_default.png
index e6648f7..dd64746 100644
--- a/packages/SystemUI/res/drawable/status_bar_back_default.png
+++ b/packages/SystemUI/res/drawable/status_bar_back_default.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/status_bar_back_pressed.png b/packages/SystemUI/res/drawable/status_bar_back_pressed.png
index beda981..66a3677 100644
--- a/packages/SystemUI/res/drawable/status_bar_back_pressed.png
+++ b/packages/SystemUI/res/drawable/status_bar_back_pressed.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/status_bar_home_default.png b/packages/SystemUI/res/drawable/status_bar_home_default.png
index ccfcb95..b129210 100644
--- a/packages/SystemUI/res/drawable/status_bar_home_default.png
+++ b/packages/SystemUI/res/drawable/status_bar_home_default.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/status_bar_home_pressed.png b/packages/SystemUI/res/drawable/status_bar_home_pressed.png
index c81c1fb..dcb2447 100644
--- a/packages/SystemUI/res/drawable/status_bar_home_pressed.png
+++ b/packages/SystemUI/res/drawable/status_bar_home_pressed.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/status_bar_icon_tray.9.png b/packages/SystemUI/res/drawable/status_bar_icon_tray.9.png
new file mode 100644
index 0000000..a39f743
--- /dev/null
+++ b/packages/SystemUI/res/drawable/status_bar_icon_tray.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/status_bar_menu_default.png b/packages/SystemUI/res/drawable/status_bar_menu_default.png
index 2499d3e..bf3a755 100644
--- a/packages/SystemUI/res/drawable/status_bar_menu_default.png
+++ b/packages/SystemUI/res/drawable/status_bar_menu_default.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable/status_bar_menu_pressed.png b/packages/SystemUI/res/drawable/status_bar_menu_pressed.png
index 33344d0..15e21d73 100644
--- a/packages/SystemUI/res/drawable/status_bar_menu_pressed.png
+++ b/packages/SystemUI/res/drawable/status_bar_menu_pressed.png
Binary files differ
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml
index d8a373e..4d82d84 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml
@@ -19,20 +19,14 @@
-->
<!-- android:background="@drawable/status_bar_closed_default_background" -->
-<FrameLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
android:background="@drawable/status_bar_background"
- android:orientation="vertical"
android:focusable="true"
android:descendantFocusability="afterDescendants"
>
- <RelativeLayout android:id="@+id/notifications"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal">
-
<!--
<LinearLayout android:id="@+id/statusIcons"
android:layout_width="wrap_content"
@@ -48,10 +42,12 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
- android:layout_marginLeft="10dp"
android:paddingLeft="6dip"
android:gravity="center_vertical"
android:orientation="horizontal"
+ android:clickable="true"
+ android:onClick="notificationIconsClicked"
+ android:background="@drawable/status_bar_icon_tray"
>
<view
class="com.android.systemui.statusbar.tablet.NotificationIconArea$MoreView"
@@ -59,66 +55,87 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/stat_notify_more"
+ android:layout_marginLeft="10dip"
/>
<view
class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout"
android:id="@+id/icons"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:layout_marginLeft="8dip"
/>
<view
class="com.android.systemui.statusbar.tablet.NotificationIconArea$DraggerView"
android:id="@+id/handle"
- android:layout_width="wrap_content"
+ android:layout_width="24dip"
android:layout_height="match_parent"
- android:src="@drawable/notification_dragger"
+ android:layout_marginLeft="8dip"
/>
-
+
</com.android.systemui.statusbar.tablet.NotificationIconArea>
-
+
<RelativeLayout android:id="@+id/systemInfo"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
+ android:layout_width="200dip"
+ android:layout_height="match_parent"
+ android:layout_centerHorizontal="true"
+ android:clickable="true"
+ android:onClick="systemInfoClicked"
>
-
<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_centerHorizontal="true"
+ android:layout_centerInParent="true"
android:singleLine="true"
android:textSize="16sp"
android:textStyle="bold"
+ android:padding="6dip"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toLeftOf="@id/clock"
+ android:layout_centerVertical="true"
+ android:src="@drawable/dots_empty"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/clock"
+ android:layout_centerVertical="true"
+ android:src="@drawable/dots_full"
/>
</RelativeLayout>
<com.android.systemui.statusbar.KeyButtonView android:id="@+id/back"
android:layout_width="wrap_content"
- android:layout_height="@*android:dimen/status_bar_height"
+ android:layout_height="match_parent"
android:layout_toLeftOf="@+id/menu"
- android:layout_marginRight="10dp"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
android:src="@drawable/status_bar_back"
systemui:keyCode="4"
/>
<com.android.systemui.statusbar.KeyButtonView android:id="@+id/menu"
android:layout_width="wrap_content"
- android:layout_height="@*android:dimen/status_bar_height"
+ android:layout_height="match_parent"
android:layout_toLeftOf="@+id/home"
android:src="@drawable/status_bar_menu"
- android:layout_marginRight="10dp"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
systemui:keyCode="82"
/>
<com.android.systemui.statusbar.KeyButtonView android:id="@+id/home"
android:layout_width="wrap_content"
- android:layout_height="@*android:dimen/status_bar_height"
+ android:layout_height="match_parent"
android:layout_alignParentRight="true"
- android:layout_marginRight="10dp"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
android:src="@drawable/status_bar_home"
systemui:keyCode="3"
/>
- </RelativeLayout>
<!--
<LinearLayout android:id="@+id/ticker"
@@ -173,5 +190,5 @@
android:background="@drawable/status_bar_background"
/>
-->
-</FrameLayout>
+</RelativeLayout>
diff --git a/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml b/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml
new file mode 100644
index 0000000..4a34f03
--- /dev/null
+++ b/packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* apps/common/assets/default/default/skins/StatusBar.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+
+<!-- android:background="@drawable/status_bar_closed_default_background" -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ >
+
+ <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"
+ >
+ <TextView
+ android:id="@+id/notificationPanelDummy"
+ android:layout_width="wrap_content"
+ android:layout_height="75dip"
+ android:layout_centerInParent="true"
+ android:gravity="center"
+ android:textColor="#FFCCCCCC"
+ android:textSize="18sp"
+ android:padding="4dip"
+ />
+ </LinearLayout>
+</FrameLayout>
diff --git a/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml b/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml
new file mode 100644
index 0000000..2222d08
--- /dev/null
+++ b/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* apps/common/assets/default/default/skins/StatusBar.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+
+<!-- android:background="@drawable/status_bar_closed_default_background" -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="300dip"
+ android:layout_width="400dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ android:background="#FF000000"
+ >
+
+ <RelativeLayout
+ android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:animationCache="false"
+ android:background="@drawable/status_bar_background"
+ android:clickable="true"
+ android:focusable="true"
+ android:descendantFocusability="afterDescendants"
+ >
+
+ <TextView
+ android:id="@+id/systemPanelDummy"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:textColor="#FFCCCCCC"
+ android:textSize="18sp"
+ />
+
+ </RelativeLayout>
+</FrameLayout>