diff options
author | Daniel Sandler <dsandler@google.com> | 2010-08-11 16:10:19 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@google.com> | 2010-08-12 02:29:57 -0400 |
commit | 6425ef950c15c47752d17952cb72836e68bd0f65 (patch) | |
tree | 48a2b1bbd716fabf95c44cb2094f67ae6f4439fb /packages/SystemUI/res | |
parent | 5320b326a48a473f58d0e99a81d75f277254b958 (diff) | |
download | frameworks_base-6425ef950c15c47752d17952cb72836e68bd0f65.zip frameworks_base-6425ef950c15c47752d17952cb72836e68bd0f65.tar.gz frameworks_base-6425ef950c15c47752d17952cb72836e68bd0f65.tar.bz2 |
System bar settings panel: first pass.
Implemented: Clock, brightness, silent toggle, airplane mode
(although this seems not to be working well yet on the
device).
Unimplemented: Orientation lock, battery, wifi signal, date.
Change-Id: Iec9cc833103a68aecccf46cd6eeffc2128d64eea
Diffstat (limited to 'packages/SystemUI/res')
17 files changed, 129 insertions, 22 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/button_frame_default.9.png b/packages/SystemUI/res/drawable-hdpi/button_frame_default.9.png Binary files differnew file mode 100644 index 0000000..d809b84 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/button_frame_default.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/button_frame_pressed.9.png b/packages/SystemUI/res/drawable-hdpi/button_frame_pressed.9.png Binary files differnew file mode 100644 index 0000000..5cc007c --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/button_frame_pressed.9.png diff --git a/packages/SystemUI/res/drawable-hdpi/system_panel_airplane_default.png b/packages/SystemUI/res/drawable-hdpi/system_panel_airplane_default.png Binary files differnew file mode 100644 index 0000000..e375ee9 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/system_panel_airplane_default.png diff --git a/packages/SystemUI/res/drawable-hdpi/system_panel_brightness_default.png b/packages/SystemUI/res/drawable-hdpi/system_panel_brightness_default.png Binary files differnew file mode 100644 index 0000000..f62502b --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/system_panel_brightness_default.png diff --git a/packages/SystemUI/res/drawable-hdpi/system_panel_orientation_default.png b/packages/SystemUI/res/drawable-hdpi/system_panel_orientation_default.png Binary files differnew file mode 100644 index 0000000..e887fb8 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/system_panel_orientation_default.png diff --git a/packages/SystemUI/res/drawable-hdpi/system_panel_orientation_locked.png b/packages/SystemUI/res/drawable-hdpi/system_panel_orientation_locked.png Binary files differnew file mode 100644 index 0000000..58159d5 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/system_panel_orientation_locked.png diff --git a/packages/SystemUI/res/drawable-hdpi/system_panel_sound_default.png b/packages/SystemUI/res/drawable-hdpi/system_panel_sound_default.png Binary files differnew file mode 100644 index 0000000..6e857b5 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/system_panel_sound_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/button_frame_default.9.png b/packages/SystemUI/res/drawable-mdpi/button_frame_default.9.png Binary files differnew file mode 100644 index 0000000..7ab1f26 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/button_frame_default.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/button_frame_pressed.9.png b/packages/SystemUI/res/drawable-mdpi/button_frame_pressed.9.png Binary files differnew file mode 100644 index 0000000..08f7a4d --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/button_frame_pressed.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/system_panel_airplane_default.png b/packages/SystemUI/res/drawable-mdpi/system_panel_airplane_default.png Binary files differnew file mode 100644 index 0000000..eb87532 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/system_panel_airplane_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/system_panel_brightness_default.png b/packages/SystemUI/res/drawable-mdpi/system_panel_brightness_default.png Binary files differnew file mode 100644 index 0000000..3bfc83e --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/system_panel_brightness_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/system_panel_orientation_default.png b/packages/SystemUI/res/drawable-mdpi/system_panel_orientation_default.png Binary files differnew file mode 100644 index 0000000..0d8479c --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/system_panel_orientation_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/system_panel_orientation_locked.png b/packages/SystemUI/res/drawable-mdpi/system_panel_orientation_locked.png Binary files differnew file mode 100644 index 0000000..8f1d26c --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/system_panel_orientation_locked.png diff --git a/packages/SystemUI/res/drawable-mdpi/system_panel_sound_default.png b/packages/SystemUI/res/drawable-mdpi/system_panel_sound_default.png Binary files differnew file mode 100644 index 0000000..22636d6 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/system_panel_sound_default.png diff --git a/packages/SystemUI/res/drawable/button_frame.xml b/packages/SystemUI/res/drawable/button_frame.xml new file mode 100644 index 0000000..5db39a5 --- /dev/null +++ b/packages/SystemUI/res/drawable/button_frame.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/button_frame_pressed" /> + <item android:drawable="@drawable/button_frame_default" /> +</selector> + diff --git a/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml b/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml index 2222d08..fc37900 100644 --- a/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml +++ b/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml @@ -2,7 +2,7 @@ <!-- /* apps/common/assets/default/default/skins/StatusBar.xml ** -** Copyright 2006, The Android Open Source Project +** 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. @@ -18,35 +18,118 @@ */ --> -<!-- android:background="@drawable/status_bar_closed_default_background" --> -<FrameLayout +<com.android.systemui.statusbar.tablet.SystemPanel xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="300dip" - android:layout_width="400dip" - android:paddingLeft="8dip" - android:paddingRight="8dip" + android:layout_height="wrap_content" + android:layout_width="match_parent" android:background="#FF000000" + android:orientation="vertical" > - - <RelativeLayout - android:id="@+id/content" + + <TextView android:id="@+id/settings_button" + style="?android:attr/textAppearance" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="left|center_vertical" + android:layout_marginTop="2dip" + android:layout_marginBottom="1dip" + android:layout_marginRight="10dip" + android:padding="8dip" + android:textSize="20sp" + android:text="@string/system_panel_settings_button" + /> + + <View + android:layout_width="match_parent" + android:layout_height="1sp" + android:background="@android:drawable/divider_horizontal_dark" + /> + + <LinearLayout + android:padding="8dip" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center" + > + <ImageButton android:id="@+id/brightness" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/system_panel_brightness_default" + android:background="@drawable/button_frame" + /> + <ImageButton android:id="@+id/sound" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dip" + android:src="@drawable/system_panel_sound_default" + android:background="@drawable/button_frame" + /> + <ImageButton android:id="@+id/orientation" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dip" + android:src="@drawable/system_panel_orientation_default" + android:background="@drawable/button_frame" + /> + <ImageButton android:id="@+id/airplane" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dip" + android:src="@drawable/system_panel_airplane_default" + android:background="@drawable/button_frame" + /> + </LinearLayout> + + <RelativeLayout + android:padding="8dip" 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" + android:layout_height="wrap_content" > + <ImageView android:id="@+id/battery_meter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:src="@drawable/dots_empty" + /> + + <TextView android:id="@+id/battery_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/battery_meter" + /> + + <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="20sp" + android:textStyle="bold" + android:padding="2dip" + android:layout_centerHorizontal="true" + /> + + <TextView android:id="@+id/date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/clock" + /> - <TextView - android:id="@+id/systemPanelDummy" + <ImageView android:id="@+id/signal_meter" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:textColor="#FFCCCCCC" - android:textSize="18sp" + android:layout_alignParentRight="true" + android:src="@drawable/dots_full" + /> + + <TextView android:id="@+id/signal_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/signal_meter" /> </RelativeLayout> -</FrameLayout> + +</com.android.systemui.statusbar.tablet.SystemPanel> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index ba3a3d1..2df3b6d 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -51,4 +51,7 @@ power usage activity to find out what drained the battery. --> <string name="battery_low_why">Battery use</string> + <!-- Name of the button that links to the Settings app. [MAXCHARS=NONE] --> + <string name="system_panel_settings_button">Settings</string> + </resources> |