diff options
103 files changed, 442 insertions, 253 deletions
diff --git a/core/res/res/values-xlarge/dimens.xml b/core/res/res/values-xlarge/dimens.xml index 516fb5f3cb5c..115cb309aa3d 100644 --- a/core/res/res/values-xlarge/dimens.xml +++ b/core/res/res/values-xlarge/dimens.xml @@ -18,12 +18,12 @@ */ --> <resources> - <dimen name="status_bar_height">50dip</dimen> + <dimen name="status_bar_height">48dip</dimen> <!-- Height of the status bar --> - <dimen name="status_bar_icon_size">50dip</dimen> + <dimen name="status_bar_icon_size">48dip</dimen> <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. --> <!-- Margin for permanent screen decorations at the bottom. --> - <dimen name="screen_margin_bottom">50dip</dimen> + <dimen name="screen_margin_bottom">48dip</dimen> <!-- Default height of a key in the password keyboard for alpha --> <dimen name="password_keyboard_key_height_alpha">0.35in</dimen> diff --git a/core/res/res/values-xlarge/styles.xml b/core/res/res/values-xlarge/styles.xml index ff7df7c3ec49..4692656a2429 100644 --- a/core/res/res/values-xlarge/styles.xml +++ b/core/res/res/values-xlarge/styles.xml @@ -27,7 +27,6 @@ </style> <style name="TextAppearance.StatusBar.Icon"> - <item name="android:textStyle">bold</item> </style> <style name="TextAppearance.StatusBar.EventContent"> <item name="android:textColor">?android:attr/textColorPrimary</item> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 18e2f479f450..c81da70fb0ea 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -5,6 +5,8 @@ > <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" /> + <uses-permission android:name="android.permission.BLUETOOTH" /> + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.GET_TASKS" /> <application diff --git a/packages/SystemUI/res/drawable-mdpi/battery_0.png b/packages/SystemUI/res/drawable-mdpi/battery_0.png Binary files differdeleted file mode 100644 index e81638d48283..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/battery_0.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/battery_10.png b/packages/SystemUI/res/drawable-mdpi/battery_10.png Binary files differdeleted file mode 100644 index a739f50ae722..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/battery_10.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/battery_100.png b/packages/SystemUI/res/drawable-mdpi/battery_100.png Binary files differdeleted file mode 100644 index 9a66db388161..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/battery_100.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/battery_25.png b/packages/SystemUI/res/drawable-mdpi/battery_25.png Binary files differdeleted file mode 100644 index 7ae7ebb96dcf..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/battery_25.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/battery_5.png b/packages/SystemUI/res/drawable-mdpi/battery_5.png Binary files differdeleted file mode 100644 index 1a15a21d6d88..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/battery_5.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/battery_50.png b/packages/SystemUI/res/drawable-mdpi/battery_50.png Binary files differdeleted file mode 100644 index 7088066b88b3..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/battery_50.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/battery_75.png b/packages/SystemUI/res/drawable-mdpi/battery_75.png Binary files differdeleted file mode 100644 index d4cfb6f3ba75..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/battery_75.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/battery_low_battery.png b/packages/SystemUI/res/drawable-mdpi/battery_low_battery.png Binary files differdeleted file mode 100644 index 60bbe6c1f85f..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/battery_low_battery.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_airplane_off.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_airplane_off.png Binary files differnew file mode 100644 index 000000000000..d897ba61d620 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_airplane_off.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_airplane_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_airplane_on.png Binary files differnew file mode 100644 index 000000000000..0296b5bc2379 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_airplane_on.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png Binary files differnew file mode 100644 index 000000000000..6c5a79bab4c9 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_battery_mini.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_battery_mini.png Binary files differnew file mode 100644 index 000000000000..9ababb741ee0 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_battery_mini.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_battery_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_battery_on.png Binary files differnew file mode 100644 index 000000000000..668b4726fd9e --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_battery_on.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_bluetooth_off.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_bluetooth_off.png Binary files differnew file mode 100644 index 000000000000..e463ba43c57a --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_bluetooth_off.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_bluetooth_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_bluetooth_on.png Binary files differnew file mode 100644 index 000000000000..1239d50abe45 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_bluetooth_on.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness.png Binary files differnew file mode 100644 index 000000000000..97fa5fccab74 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness_auto.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness_auto.png Binary files differnew file mode 100644 index 000000000000..37a1533ed482 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness_auto.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness_low.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness_low.png Binary files differnew file mode 100644 index 000000000000..8a55e3a34735 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_brightness_low.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_close.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_close.png Binary files differnew file mode 100644 index 000000000000..53abcbc6d80a --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_close.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_default_bg.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_default_bg.png Binary files differnew file mode 100644 index 000000000000..3e82d4e15cd5 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_default_bg.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_gps_off.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_gps_off.png Binary files differnew file mode 100644 index 000000000000..dc2ed346e9e2 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_gps_off.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_gps_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_gps_on.png Binary files differnew file mode 100644 index 000000000000..1e39fdc8f00a --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_gps_on.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png Binary files differnew file mode 100644 index 000000000000..ed813dc1cf6d --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lightsout.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lightsout.png Binary files differnew file mode 100644 index 000000000000..8a07acc978e3 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lightsout.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png Binary files differnew file mode 100644 index 000000000000..d7775f25f187 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_open.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_open.png Binary files differnew file mode 100644 index 000000000000..b7d624e29e5d --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_open.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_press_bg.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_press_bg.png Binary files differnew file mode 100644 index 000000000000..095839320737 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_press_bg.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png Binary files differnew file mode 100644 index 000000000000..178af731be51 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_off_lanscape.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_off_lanscape.png Binary files differnew file mode 100644 index 000000000000..adaadf711a53 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_off_lanscape.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_off_portrait.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_off_portrait.png Binary files differnew file mode 100644 index 000000000000..fdc0ac72c435 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_off_portrait.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_on.png Binary files differnew file mode 100644 index 000000000000..4517d1b773f1 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_rotate_on.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_sound_off.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_sound_off.png Binary files differnew file mode 100644 index 000000000000..bd11e860984a --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_sound_off.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_sound_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_sound_on.png Binary files differnew file mode 100644 index 000000000000..1b3ba2f6643d --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_sound_on.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_mini.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_mini.png Binary files differnew file mode 100644 index 000000000000..ffbd2d3fe7db --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_mini.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_off.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_off.png Binary files differnew file mode 100644 index 000000000000..87acc14fe554 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_off.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_on.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_on.png Binary files differnew file mode 100644 index 000000000000..bbb1c74cf339 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_wifi_on.png diff --git a/packages/SystemUI/res/drawable-mdpi/signal_0.png b/packages/SystemUI/res/drawable-mdpi/signal_0.png Binary files differdeleted file mode 100644 index ff2727bc64cd..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_0.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/signal_100.png b/packages/SystemUI/res/drawable-mdpi/signal_100.png Binary files differdeleted file mode 100644 index 55c34ff2cd82..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_100.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/signal_25.png b/packages/SystemUI/res/drawable-mdpi/signal_25.png Binary files differdeleted file mode 100644 index a415596db172..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_25.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/signal_50.png b/packages/SystemUI/res/drawable-mdpi/signal_50.png Binary files differdeleted file mode 100644 index 3c5a708b01a6..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_50.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/signal_75.png b/packages/SystemUI/res/drawable-mdpi/signal_75.png Binary files differdeleted file mode 100644 index e176f37f4dfe..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_75.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/signal_scan1.png b/packages/SystemUI/res/drawable-mdpi/signal_scan1.png Binary files differdeleted file mode 100644 index f64b9cc28133..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_scan1.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/signal_scan2.png b/packages/SystemUI/res/drawable-mdpi/signal_scan2.png Binary files differdeleted file mode 100644 index 982feb4707d3..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_scan2.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/signal_scan3.png b/packages/SystemUI/res/drawable-mdpi/signal_scan3.png Binary files differdeleted file mode 100644 index a4c0689047a8..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_scan3.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/signal_scan4.png b/packages/SystemUI/res/drawable-mdpi/signal_scan4.png Binary files differdeleted file mode 100644 index d1e95fe51db7..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/signal_scan4.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_0.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_0.png Binary files differnew file mode 100644 index 000000000000..ff75a51192e7 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_0.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_10.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_10.png Binary files differnew file mode 100644 index 000000000000..66ab4c6d6c67 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_10.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_100.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_100.png Binary files differnew file mode 100644 index 000000000000..3b50500a0048 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_100.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_20.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_20.png Binary files differnew file mode 100644 index 000000000000..911906525621 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_20.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_30.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_30.png Binary files differnew file mode 100644 index 000000000000..296f19f26b83 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_30.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_40.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_40.png Binary files differnew file mode 100644 index 000000000000..9daab2329afd --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_40.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_50.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_50.png Binary files differnew file mode 100644 index 000000000000..62d24c425d3f --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_50.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_60.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_60.png Binary files differnew file mode 100644 index 000000000000..eea927a12bc8 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_60.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_70.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_70.png Binary files differnew file mode 100644 index 000000000000..6816088ca7bf --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_70.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_80.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_80.png Binary files differnew file mode 100644 index 000000000000..b7dd9bbc8546 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_80.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_battery_90.png b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_90.png Binary files differnew file mode 100644 index 000000000000..6e36f538c58c --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_battery_90.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_batterymini_100.png b/packages/SystemUI/res/drawable-mdpi/sysbar_batterymini_100.png Binary files differnew file mode 100644 index 000000000000..8eb0f29e8836 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_batterymini_100.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_batterymini_red.png b/packages/SystemUI/res/drawable-mdpi/sysbar_batterymini_red.png Binary files differnew file mode 100644 index 000000000000..adcc6b93aacf --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_batterymini_red.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_hidenotification_handle.png b/packages/SystemUI/res/drawable-mdpi/sysbar_hidenotification_handle.png Binary files differnew file mode 100644 index 000000000000..e43edd7f3b8f --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_hidenotification_handle.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_minimeter_bg.png b/packages/SystemUI/res/drawable-mdpi/sysbar_minimeter_bg.png Binary files differnew file mode 100644 index 000000000000..0d265fc93ba4 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_minimeter_bg.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_panel_bg.9.png b/packages/SystemUI/res/drawable-mdpi/sysbar_panel_bg.9.png Binary files differnew file mode 100644 index 000000000000..77e034b63198 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_panel_bg.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_0.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_0.png Binary files differnew file mode 100644 index 000000000000..746937204a45 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_0.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_10.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_10.png Binary files differnew file mode 100644 index 000000000000..6625d9a245b7 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_10.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_100.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_100.png Binary files differnew file mode 100644 index 000000000000..b2e763b0d3e6 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_100.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_20.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_20.png Binary files differnew file mode 100644 index 000000000000..fb66362a8f12 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_20.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_30.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_30.png Binary files differnew file mode 100644 index 000000000000..a87d94e02569 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_30.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_40.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_40.png Binary files differnew file mode 100644 index 000000000000..8e229d54a954 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_40.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_50.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_50.png Binary files differnew file mode 100644 index 000000000000..fe989d4c40ce --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_50.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_60.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_60.png Binary files differnew file mode 100644 index 000000000000..aac57dc24870 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_60.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_70.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_70.png Binary files differnew file mode 100644 index 000000000000..22819689442e --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_70.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_80.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_80.png Binary files differnew file mode 100644 index 000000000000..7177ae14f435 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_80.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signal_90.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_90.png Binary files differnew file mode 100644 index 000000000000..7f6048070009 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signal_90.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_signalmini_100.png b/packages/SystemUI/res/drawable-mdpi/sysbar_signalmini_100.png Binary files differnew file mode 100644 index 000000000000..a5eaa63272a6 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_signalmini_100.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_toggle_bg_off.9.png b/packages/SystemUI/res/drawable-mdpi/sysbar_toggle_bg_off.9.png Binary files differnew file mode 100644 index 000000000000..94849d87dfad --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_toggle_bg_off.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/sysbar_toggle_bg_on.9.png b/packages/SystemUI/res/drawable-mdpi/sysbar_toggle_bg_on.9.png Binary files differnew file mode 100644 index 000000000000..f11058c99384 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/sysbar_toggle_bg_on.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_0.png b/packages/SystemUI/res/drawable-mdpi/wifi_0.png Binary files differdeleted file mode 100644 index e81638d48283..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_0.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_100.png b/packages/SystemUI/res/drawable-mdpi/wifi_100.png Binary files differdeleted file mode 100644 index 4468389edfe8..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_100.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_25.png b/packages/SystemUI/res/drawable-mdpi/wifi_25.png Binary files differdeleted file mode 100644 index 0e389a7c19e1..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_25.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_50.png b/packages/SystemUI/res/drawable-mdpi/wifi_50.png Binary files differdeleted file mode 100644 index 1cad0d18aa19..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_50.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_75.png b/packages/SystemUI/res/drawable-mdpi/wifi_75.png Binary files differdeleted file mode 100644 index dd2d7dcb8641..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_75.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_scan1.png b/packages/SystemUI/res/drawable-mdpi/wifi_scan1.png Binary files differdeleted file mode 100644 index 0e389a7c19e1..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_scan1.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_scan2.png b/packages/SystemUI/res/drawable-mdpi/wifi_scan2.png Binary files differdeleted file mode 100644 index 34e7c7041bb1..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_scan2.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_scan3.png b/packages/SystemUI/res/drawable-mdpi/wifi_scan3.png Binary files differdeleted file mode 100644 index 4c2a9e1b7b6f..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_scan3.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/wifi_scan4.png b/packages/SystemUI/res/drawable-mdpi/wifi_scan4.png Binary files differdeleted file mode 100644 index b504131196d1..000000000000 --- a/packages/SystemUI/res/drawable-mdpi/wifi_scan4.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable/battery.xml b/packages/SystemUI/res/drawable/battery.xml deleted file mode 100644 index 3bc0c74ee1ff..000000000000 --- a/packages/SystemUI/res/drawable/battery.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/drawable/stat_sys_battery.xml -** -** Copyright 2007, 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. -*/ ---> - -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="1" android:drawable="@drawable/battery_0" /> - <item android:maxLevel="5" android:drawable="@drawable/battery_5" /> - <item android:maxLevel="10" android:drawable="@drawable/battery_10" /> - <item android:maxLevel="25" android:drawable="@drawable/battery_25" /> - <item android:maxLevel="50" android:drawable="@drawable/battery_50" /> - <item android:maxLevel="75" android:drawable="@drawable/battery_75" /> - <item android:maxLevel="101" android:drawable="@drawable/battery_100" /> -</level-list> - diff --git a/packages/SystemUI/res/drawable/battery_charging.xml b/packages/SystemUI/res/drawable/battery_charging.xml deleted file mode 100644 index c9b77ddda927..000000000000 --- a/packages/SystemUI/res/drawable/battery_charging.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/drawable/stat_sys_battery.xml -** -** Copyright 2007, 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. -*/ ---> - -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="25"> - <animation-list android:oneshot="false"> - <item android:drawable="@drawable/battery_0" android:duration="1000" /> - <item android:drawable="@drawable/battery_25" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="50"> - <animation-list android:oneshot="false"> - <item android:drawable="@drawable/battery_25" android:duration="1000" /> - <item android:drawable="@drawable/battery_50" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="75"> - <animation-list android:oneshot="false"> - <item android:drawable="@drawable/battery_50" android:duration="1000" /> - <item android:drawable="@drawable/battery_75" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="92"> - <animation-list android:oneshot="false"> - <item android:drawable="@drawable/battery_75" android:duration="1000" /> - <item android:drawable="@drawable/battery_100" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="101" android:drawable="@drawable/battery_100" /> -</level-list> - diff --git a/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml b/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml new file mode 100644 index 000000000000..d8ba2a89252f --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml @@ -0,0 +1,21 @@ +<?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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_press_bg" /> + <item android:drawable="@drawable/ic_sysbar_default_bg" /> +</selector> + diff --git a/packages/SystemUI/res/drawable/signal_scan.xml b/packages/SystemUI/res/drawable/signal_scan.xml deleted file mode 100644 index fe2199263222..000000000000 --- a/packages/SystemUI/res/drawable/signal_scan.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/drawable/stat_sys_battery.xml -** -** Copyright 2007, 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. -*/ ---> - -<animation-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/signal_scan1" android:duration="500" /> - <item android:drawable="@drawable/signal_scan2" android:duration="500" /> - <item android:drawable="@drawable/signal_scan3" android:duration="500" /> - <item android:drawable="@drawable/signal_scan4" android:duration="500" /> - <item android:drawable="@drawable/signal_scan3" android:duration="500" /> - <item android:drawable="@drawable/signal_scan2" android:duration="500" /> -</animation-list> - diff --git a/packages/SystemUI/res/drawable/sysbar_battery.xml b/packages/SystemUI/res/drawable/sysbar_battery.xml new file mode 100644 index 000000000000..9551bf0539ad --- /dev/null +++ b/packages/SystemUI/res/drawable/sysbar_battery.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/res/drawable/stat_sys_battery.xml +** +** Copyright 2007, 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. +*/ +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="01" android:drawable="@drawable/sysbar_battery_0" /> + <item android:maxLevel="10" android:drawable="@drawable/sysbar_battery_10" /> + <item android:maxLevel="20" android:drawable="@drawable/sysbar_battery_20" /> + <item android:maxLevel="30" android:drawable="@drawable/sysbar_battery_30" /> + <item android:maxLevel="40" android:drawable="@drawable/sysbar_battery_40" /> + <item android:maxLevel="50" android:drawable="@drawable/sysbar_battery_50" /> + <item android:maxLevel="60" android:drawable="@drawable/sysbar_battery_60" /> + <item android:maxLevel="70" android:drawable="@drawable/sysbar_battery_70" /> + <item android:maxLevel="80" android:drawable="@drawable/sysbar_battery_80" /> + <item android:maxLevel="90" android:drawable="@drawable/sysbar_battery_90" /> + <item android:maxLevel="101" android:drawable="@drawable/sysbar_battery_100" /> +</level-list> diff --git a/packages/SystemUI/res/drawable/wifi.xml b/packages/SystemUI/res/drawable/sysbar_batterymini.xml index 6e63af612672..f7ba6b1f44e4 100644 --- a/packages/SystemUI/res/drawable/wifi.xml +++ b/packages/SystemUI/res/drawable/sysbar_batterymini.xml @@ -18,12 +18,12 @@ */ --> -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="01" android:drawable="@drawable/wifi_0" /> - <item android:maxLevel="25" android:drawable="@drawable/wifi_25" /> - <item android:maxLevel="50" android:drawable="@drawable/wifi_50" /> - <item android:maxLevel="75" android:drawable="@drawable/wifi_75" /> - <item android:maxLevel="101" android:drawable="@drawable/wifi_100" /> - -</level-list> - +<clip xmlns:android="http://schemas.android.com/apk/res/android" + android:clipOrientation="horizontal" + android:maxLevel="100" + android:gravity="left"> + <level-list> + <item android:maxLevel="15" android:drawable="@drawable/sysbar_batterymini_red" /> + <item android:maxLevel="101" android:drawable="@drawable/sysbar_batterymini_100" /> + </level-list> +</clip> diff --git a/packages/SystemUI/res/drawable/sysbar_signal.xml b/packages/SystemUI/res/drawable/sysbar_signal.xml new file mode 100644 index 000000000000..9561c376e630 --- /dev/null +++ b/packages/SystemUI/res/drawable/sysbar_signal.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/res/drawable/stat_sys_battery.xml +** +** Copyright 2007, 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. +*/ +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="01" android:drawable="@drawable/sysbar_signal_0" /> + <item android:maxLevel="10" android:drawable="@drawable/sysbar_signal_10" /> + <item android:maxLevel="20" android:drawable="@drawable/sysbar_signal_20" /> + <item android:maxLevel="30" android:drawable="@drawable/sysbar_signal_30" /> + <item android:maxLevel="40" android:drawable="@drawable/sysbar_signal_40" /> + <item android:maxLevel="50" android:drawable="@drawable/sysbar_signal_50" /> + <item android:maxLevel="60" android:drawable="@drawable/sysbar_signal_60" /> + <item android:maxLevel="70" android:drawable="@drawable/sysbar_signal_70" /> + <item android:maxLevel="80" android:drawable="@drawable/sysbar_signal_80" /> + <item android:maxLevel="90" android:drawable="@drawable/sysbar_signal_90" /> + <item android:maxLevel="101" android:drawable="@drawable/sysbar_signal_100" /> +</level-list> diff --git a/packages/SystemUI/res/drawable/signal.xml b/packages/SystemUI/res/drawable/sysbar_signalmini.xml index 7367418a1114..ca6c9ede6f9e 100644 --- a/packages/SystemUI/res/drawable/signal.xml +++ b/packages/SystemUI/res/drawable/sysbar_signalmini.xml @@ -18,11 +18,8 @@ */ --> -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="01" android:drawable="@drawable/signal_0" /> - <item android:maxLevel="25" android:drawable="@drawable/signal_25" /> - <item android:maxLevel="50" android:drawable="@drawable/signal_50" /> - <item android:maxLevel="75" android:drawable="@drawable/signal_75" /> - <item android:maxLevel="101" android:drawable="@drawable/signal_100" /> -</level-list> - +<clip xmlns:android="http://schemas.android.com/apk/res/android" + android:clipOrientation="horizontal" + android:gravity="right" + android:maxLevel="100" + android:drawable="@drawable/sysbar_signalmini_100" /> diff --git a/packages/SystemUI/res/drawable/sysbar_wifi.xml b/packages/SystemUI/res/drawable/sysbar_wifi.xml new file mode 100644 index 000000000000..9561c376e630 --- /dev/null +++ b/packages/SystemUI/res/drawable/sysbar_wifi.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/res/drawable/stat_sys_battery.xml +** +** Copyright 2007, 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. +*/ +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="01" android:drawable="@drawable/sysbar_signal_0" /> + <item android:maxLevel="10" android:drawable="@drawable/sysbar_signal_10" /> + <item android:maxLevel="20" android:drawable="@drawable/sysbar_signal_20" /> + <item android:maxLevel="30" android:drawable="@drawable/sysbar_signal_30" /> + <item android:maxLevel="40" android:drawable="@drawable/sysbar_signal_40" /> + <item android:maxLevel="50" android:drawable="@drawable/sysbar_signal_50" /> + <item android:maxLevel="60" android:drawable="@drawable/sysbar_signal_60" /> + <item android:maxLevel="70" android:drawable="@drawable/sysbar_signal_70" /> + <item android:maxLevel="80" android:drawable="@drawable/sysbar_signal_80" /> + <item android:maxLevel="90" android:drawable="@drawable/sysbar_signal_90" /> + <item android:maxLevel="101" android:drawable="@drawable/sysbar_signal_100" /> +</level-list> diff --git a/packages/SystemUI/res/drawable/wifi_scan.xml b/packages/SystemUI/res/drawable/sysbar_wifimini.xml index 5888d0e170e1..ca6c9ede6f9e 100644 --- a/packages/SystemUI/res/drawable/wifi_scan.xml +++ b/packages/SystemUI/res/drawable/sysbar_wifimini.xml @@ -18,12 +18,8 @@ */ --> -<animation-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/wifi_scan1" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan2" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan3" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan4" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan3" android:duration="500" /> - <item android:drawable="@drawable/wifi_scan2" android:duration="500" /> -</animation-list> - +<clip xmlns:android="http://schemas.android.com/apk/res/android" + android:clipOrientation="horizontal" + android:gravity="right" + android:maxLevel="100" + android:drawable="@drawable/sysbar_signalmini_100" /> diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml index 65db981ea752..1d04f6780c14 100644 --- a/packages/SystemUI/res/layout-xlarge/status_bar.xml +++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml @@ -35,18 +35,7 @@ android:paddingLeft="6dip" android:gravity="center_vertical" android:orientation="horizontal" - android:clickable="true" - android:onClick="notificationIconsClicked" - android:background="@drawable/status_bar_icon_tray" > - <ImageView - class="com.android.systemui.statusbar.tablet.NotificationIconArea$MoreView" - android:id="@+id/expand" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/status_bar_expand" - android:onClick="notificationIconsClicked" - /> <view class="com.android.systemui.statusbar.tablet.NotificationIconArea$IconLayout" android:id="@+id/icons" @@ -57,10 +46,19 @@ <view class="com.android.systemui.statusbar.tablet.NotificationIconArea$DraggerView" android:id="@+id/handle" - android:layout_width="24dip" + android:layout_width="32dip" android:layout_height="match_parent" + android:background="@drawable/sysbar_hidenotification_handle" android:layout_marginLeft="8dip" /> + <ImageView + class="com.android.systemui.statusbar.tablet.NotificationIconArea$MoreView" + android:id="@+id/expand" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_sysbar_open" + android:onClick="notificationIconsClicked" + /> </com.android.systemui.statusbar.tablet.NotificationIconArea> @@ -101,7 +99,7 @@ </LinearLayout> <include layout="@layout/status_bar_center" - android:layout_width="160dip" + android:layout_width="256dip" android:layout_height="match_parent" android:layout_centerInParent="true" /> @@ -110,16 +108,18 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_toLeftOf="@+id/recent" - android:src="@drawable/status_bar_menu" + android:src="@drawable/ic_sysbar_menu" + android:background="@drawable/ic_sysbar_icon_bg" android:paddingLeft="4dip" android:paddingRight="4dip" systemui:keyCode="82" /> - <Button android:id="@+id/recent" + <ImageButton android:id="@+id/recent" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_toLeftOf="@+id/home" - android:background="@drawable/status_bar_recent" + android:src="@drawable/ic_sysbar_recent" + android:background="@drawable/ic_sysbar_icon_bg" android:paddingLeft="4dip" android:paddingRight="4dip" android:onClick="recentButtonClicked" @@ -127,10 +127,11 @@ <com.android.systemui.statusbar.KeyButtonView android:id="@+id/home" android:layout_width="wrap_content" android:layout_height="match_parent" + android:layout_toLeftOf="@+id/back" android:paddingLeft="4dip" android:paddingRight="4dip" - android:layout_toLeftOf="@+id/back" - android:src="@drawable/status_bar_home" + android:src="@drawable/ic_sysbar_home" + android:background="@drawable/ic_sysbar_icon_bg" systemui:keyCode="3" /> <com.android.systemui.statusbar.KeyButtonView android:id="@+id/back" @@ -139,7 +140,8 @@ android:layout_alignParentRight="true" android:paddingLeft="4dip" android:paddingRight="4dip" - android:src="@drawable/status_bar_back" + android:src="@drawable/ic_sysbar_back" + android:background="@drawable/ic_sysbar_icon_bg" systemui:keyCode="4" /> </RelativeLayout> diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_center.xml b/packages/SystemUI/res/layout-xlarge/status_bar_center.xml index 5bf83162c90e..2d74672dbb90 100644 --- a/packages/SystemUI/res/layout-xlarge/status_bar_center.xml +++ b/packages/SystemUI/res/layout-xlarge/status_bar_center.xml @@ -18,7 +18,7 @@ <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="160dip" + android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerInParent="true" android:clickable="true" @@ -38,17 +38,35 @@ /> <ImageView android:id="@+id/battery" - android:layout_width="48dip" - android:layout_height="48dip" + android:layout_width="64dip" + android:layout_height="16dip" android:layout_toLeftOf="@id/clock" - android:src="@drawable/battery" + android:layout_centerInParent="true" + android:background="@drawable/sysbar_minimeter_bg" /> <ImageView android:id="@+id/signal" - android:layout_width="48dip" - android:layout_height="48dip" + android:layout_width="64dip" + android:layout_height="16dip" android:layout_toRightOf="@id/clock" - android:src="@drawable/signal" + android:layout_centerInParent="true" + android:background="@drawable/sysbar_minimeter_bg" + /> + <ImageView + android:id="@+id/battery_icon" + android:layout_height="30dip" + android:layout_width="30dip" + android:layout_toLeftOf="@id/battery" + android:layout_centerInParent="true" + android:src="@drawable/ic_sysbar_battery_mini" + /> + <ImageView + android:id="@+id/signal_icon" + android:layout_height="30dip" + android:layout_width="30dip" + android:layout_toRightOf="@id/signal" + android:layout_centerInParent="true" + android:src="@drawable/ic_sysbar_wifi_mini" /> </RelativeLayout> diff --git a/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml b/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml index 36c6388ec10f..7e469f74f9a8 100644 --- a/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml +++ b/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml @@ -22,130 +22,187 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:layout_width="match_parent" - android:background="#FF000000" + android:background="@drawable/sysbar_panel_bg" android:orientation="vertical" + android:paddingLeft="70dip" + android:paddingRight="120dip" > - <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" - /> - + <!-- top row: quick settings buttons --> <LinearLayout - android:padding="8dip" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="64dip" 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" + android:layout_width="90dip" + android:layout_height="64dip" + android:src="@drawable/ic_sysbar_brightness" + android:background="@drawable/sysbar_toggle_bg_off" /> <ImageButton android:id="@+id/sound" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="90dip" + android:layout_height="64dip" android:layout_marginLeft="8dip" - android:src="@drawable/system_panel_sound_default" - android:background="@drawable/button_frame" + android:src="@drawable/ic_sysbar_sound_on" + android:background="@drawable/sysbar_toggle_bg_off" /> <ImageButton android:id="@+id/orientation" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="90dip" + android:layout_height="64dip" android:layout_marginLeft="8dip" - android:src="@drawable/system_panel_orientation_default" - android:background="@drawable/button_frame" + android:src="@drawable/ic_sysbar_rotate_on" + android:background="@drawable/sysbar_toggle_bg_off" /> <ImageButton android:id="@+id/airplane" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="90dip" + android:layout_height="64dip" + android:layout_marginLeft="8dip" + android:src="@drawable/ic_sysbar_airplane_on" + android:background="@drawable/sysbar_toggle_bg_off" + /> + <ImageButton android:id="@+id/gps" + android:layout_width="90dip" + android:layout_height="64dip" android:layout_marginLeft="8dip" - android:src="@drawable/system_panel_airplane_default" - android:background="@drawable/button_frame" + android:src="@drawable/ic_sysbar_gps_on" + android:background="@drawable/sysbar_toggle_bg_off" + /> + <ImageButton android:id="@+id/bluetooth" + android:layout_width="90dip" + android:layout_height="64dip" + android:layout_marginLeft="8dip" + android:src="@drawable/ic_sysbar_bluetooth_on" + android:background="@drawable/sysbar_toggle_bg_off" /> </LinearLayout> + <!-- main row: meters, clock --> <RelativeLayout android:padding="8dip" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="192dip" > <RelativeLayout - android:layout_width="120dip" - android:layout_height="wrap_content" + android:layout_width="256dip" + android:layout_height="192dip" android:layout_alignParentLeft="true" + android:layout_marginLeft="48dip" > <ImageView android:id="@+id/battery_meter" - android:layout_width="96dip" + android:layout_width="256dip" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" + android:layout_alignParentBottom="true" android:scaleType="centerCrop" - android:src="@drawable/battery" + android:src="@drawable/sysbar_battery" /> - <TextView android:id="@+id/battery_info" + style="@style/TextAppearance.StatusBar.SystemPanel" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="24dip" android:gravity="center" - android:layout_below="@id/battery_meter" + android:layout_above="@id/battery_meter" /> </RelativeLayout> <com.android.systemui.statusbar.Clock - style="@*android:style/TextAppearance.StatusBar.Icon" + style="@style/TextAppearance.StatusBar.SystemPanel" 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:textSize="50sp" + android:textStyle="normal" + android:textColor="#FFFFFFFF" android:layout_centerHorizontal="true" - /> - - <TextView android:id="@+id/date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/clock" + android:layout_alignParentBottom="true" /> <RelativeLayout - android:layout_width="120dip" - android:layout_height="wrap_content" + android:layout_width="256dip" + android:layout_height="192dip" android:layout_alignParentRight="true" + android:layout_marginRight="48dip" > <ImageView android:id="@+id/signal_meter" - android:layout_width="96dip" + android:layout_width="256dip" android:layout_height="wrap_content" - android:layout_centerHorizontal="true" + android:layout_alignParentBottom="true" android:scaleType="centerCrop" - android:src="@drawable/signal" + android:src="@drawable/sysbar_signal" /> <TextView android:id="@+id/signal_info" + style="@style/TextAppearance.StatusBar.SystemPanel" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="24dip" android:gravity="center" - android:layout_below="@id/signal_meter" + android:layout_above="@id/signal_meter" /> </RelativeLayout> + <ImageView + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="8dip" + android:layout_marginLeft="8dip" + android:src="@drawable/ic_sysbar_battery_on" + /> + <ImageView + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="8dip" + android:layout_marginRight="8dip" + android:src="@drawable/ic_sysbar_wifi_on" + /> </RelativeLayout> + <!-- bottom row: transient indicators, settings button --> + <View + android:layout_width="match_parent" + android:layout_height="1sp" + android:background="@android:drawable/divider_horizontal_dark" + /> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="48dip" + > + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:orientation="horizontal" + > + <!-- TODO: alarm --> + <!-- TODO: sync --> + <TextView android:id="@+id/date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + </LinearLayout> + + <TextView android:id="@+id/settings_button" + style="@style/TextAppearance.StatusBar.TextButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:paddingRight="32dip" + android:paddingLeft="32dip" + android:textSize="20sp" + android:text="@string/system_panel_settings_button" + /> + <View + android:layout_height="match_parent" + android:layout_width="1sp" + android:layout_toLeftOf="@id/settings_button" + android:background="@*android:drawable/divider_vertical_dark" + /> + + </RelativeLayout> </com.android.systemui.statusbar.tablet.SystemPanel> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 816f34a418a9..f592703b929b 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -25,4 +25,18 @@ <style name="TextAppearance.StatusBar.IntruderAlert" parent="@android:style/TextAppearance.StatusBar"> </style> + + <style name="TextAppearance.StatusBar.SystemPanel" + parent="@android:style/TextAppearance.StatusBar"> + <item name="android:textAppearance">?android:attr/textAppearance</item> + <item name="android:textStyle">normal</item> + <item name="android:textColor">#50FFFFFF</item> + </style> + + <style name="TextAppearance.StatusBar.TextButton" + parent="@android:style/TextAppearance.StatusBar"> + <item name="android:textAppearance">?android:attr/textAppearance</item> + <item name="android:textStyle">normal</item> + <item name="android:textColor">#FFFFFFFF</item> + </style> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SystemPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SystemPanel.java index a32b01fd8f9e..491ef1da9f5f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SystemPanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SystemPanel.java @@ -20,6 +20,7 @@ import android.app.Notification; import android.app.PendingIntent; import android.app.Service; import android.app.StatusBarManager; +import android.bluetooth.BluetoothAdapter; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -28,6 +29,7 @@ import android.content.IntentFilter; import android.content.res.Resources; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.location.LocationManager; import android.media.AudioManager; import android.net.NetworkInfo; import android.net.wifi.SupplicantState; @@ -84,7 +86,6 @@ public class SystemPanel extends LinearLayout { private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON; private static final int DEFAULT_BACKLIGHT = (int) (android.os.Power.BRIGHTNESS_ON * 0.4f); - private TabletStatusBarService mBar; private boolean mAirplaneMode; @@ -92,6 +93,8 @@ public class SystemPanel extends LinearLayout { private ImageButton mSoundButton; private ImageButton mOrientationButton; private ImageButton mAirplaneButton; + private ImageButton mGpsButton; + private ImageButton mBluetoothButton; private ImageView mBatteryMeter; private ImageView mSignalMeter; @@ -102,6 +105,7 @@ public class SystemPanel extends LinearLayout { private final AudioManager mAudioManager; private final WifiManager mWifiManager; private final TelephonyManager mPhone; + private final BluetoothAdapter mBluetoothAdapter; // state trackers for telephony code IccCard.State mSimState = IccCard.State.READY; @@ -123,7 +127,7 @@ public class SystemPanel extends LinearLayout { public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) { - mSoundButton.setAlpha(getSilentMode() ? 0x7F : 0xFF); + refreshSound(); } else if (action.equals(Intent.ACTION_BATTERY_CHANGED)) { updateBattery(intent); } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION) @@ -133,6 +137,8 @@ public class SystemPanel extends LinearLayout { updateWifiState(intent); } else if (action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) { updateSimState(intent); + } else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) { + refreshBluetooth(); } } }; @@ -295,7 +301,7 @@ public class SystemPanel extends LinearLayout { mWifiConnected = detailedState == NetworkInfo.DetailedState.CONNECTED; } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) { final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200); - int newSignalLevel = WifiManager.calculateSignalLevel(newRssi, 6) * 20; + int newSignalLevel = WifiManager.calculateSignalLevel(newRssi, 101); mWifiLevel = mWifiConnected ? newSignalLevel : 0; } @@ -351,7 +357,7 @@ public class SystemPanel extends LinearLayout { level = 0; } - mSignalMeter.setImageResource(mWifiConnected ? R.drawable.wifi : R.drawable.signal); + mSignalMeter.setImageResource(R.drawable.sysbar_signal); mSignalMeter.setImageLevel(level); mSignalText.setText(text); @@ -367,7 +373,7 @@ public class SystemPanel extends LinearLayout { final int level = intent.getIntExtra("level", 0); final boolean plugged = intent.getIntExtra("plugged", 0) != 0; - mBatteryMeter.setImageResource(plugged ? R.drawable.battery_charging : R.drawable.battery); + mBatteryMeter.setImageResource(R.drawable.sysbar_battery); mBatteryMeter.setImageLevel(level); mBatteryText.setText(getContext() .getString(R.string.system_panel_battery_meter_format, level)); @@ -401,6 +407,9 @@ public class SystemPanel extends LinearLayout { // mobile data mPhone = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE); + + // Bluetooth + mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); } public void onAttachedToWindow() { @@ -445,6 +454,22 @@ public class SystemPanel extends LinearLayout { } }); + mGpsButton = (ImageButton)findViewById(R.id.gps); + mGpsButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + toggleGps(); + refreshGps(); + } + }); + + mBluetoothButton = (ImageButton)findViewById(R.id.bluetooth); + mBluetoothButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + toggleBluetooth(); + refreshBluetooth(); + } + }); + // register for broadcasts IntentFilter filter = new IntentFilter(); filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION); @@ -454,19 +479,22 @@ public class SystemPanel extends LinearLayout { filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); filter.addAction(WifiManager.RSSI_CHANGED_ACTION); filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED); + filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); getContext().registerReceiver(mReceiver, filter); mBatteryMeter = (ImageView)findViewById(R.id.battery_meter); - mBatteryMeter.setImageResource(R.drawable.battery); + mBatteryMeter.setImageResource(R.drawable.sysbar_battery); mBatteryMeter.setImageLevel(0); mSignalMeter = (ImageView)findViewById(R.id.signal_meter); - mBatteryMeter.setImageResource(R.drawable.signal); + mBatteryMeter.setImageResource(R.drawable.sysbar_signal); mBatteryMeter.setImageLevel(0); mBatteryText = (TextView)findViewById(R.id.battery_info); mSignalText = (TextView)findViewById(R.id.signal_info); refreshSignalMeters(); + refreshBluetooth(); + refreshGps(); } public void onDetachedFromWindow() { @@ -492,7 +520,8 @@ public class SystemPanel extends LinearLayout { // } private void rotateBrightness() { - int alpha = 0xFF; + int icon = R.drawable.ic_sysbar_brightness; + int bg = R.drawable.sysbar_toggle_bg_on; Context context = getContext(); try { IPowerManager power = IPowerManager.Stub.asInterface( @@ -513,18 +542,16 @@ public class SystemPanel extends LinearLayout { // Technically, not a toggle... if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) { brightness = MINIMUM_BACKLIGHT; + icon = R.drawable.ic_sysbar_brightness_low; brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; - alpha = 0x40; } else if (brightness < DEFAULT_BACKLIGHT) { brightness = DEFAULT_BACKLIGHT; - alpha = 0xC0; } else if (brightness < MAXIMUM_BACKLIGHT) { brightness = MAXIMUM_BACKLIGHT; - alpha = 0xFF; } else { brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; brightness = MINIMUM_BACKLIGHT; - alpha = 0x60; + icon = R.drawable.ic_sysbar_brightness_auto; } if (context.getResources().getBoolean( @@ -546,7 +573,8 @@ public class SystemPanel extends LinearLayout { } catch (Settings.SettingNotFoundException e) { } - mBrightnessButton.setAlpha(alpha); + mBrightnessButton.setImageResource(icon); + mBrightnessButton.setBackgroundResource(bg); } PhoneStateListener mPhoneStateListener = new PhoneStateListener() { @@ -558,7 +586,12 @@ public class SystemPanel extends LinearLayout { mServiceState = serviceState; mAirplaneMode = serviceState.getState() == ServiceState.STATE_POWER_OFF; if (mAirplaneButton != null) { - mAirplaneButton.setAlpha(mAirplaneMode ? 0xFF : 0x7F); + mAirplaneButton.setImageResource(mAirplaneMode + ? R.drawable.ic_sysbar_airplane_on + : R.drawable.ic_sysbar_airplane_off); + mAirplaneButton.setBackgroundResource(mAirplaneMode + ? R.drawable.sysbar_toggle_bg_on + : R.drawable.sysbar_toggle_bg_off); } updateDataState(); } @@ -621,4 +654,51 @@ public class SystemPanel extends LinearLayout { } } + void refreshSound() { + boolean silent = getSilentMode(); + mSoundButton.setImageResource(!silent + ? R.drawable.ic_sysbar_sound_on + : R.drawable.ic_sysbar_sound_off); + mSoundButton.setBackgroundResource(!silent + ? R.drawable.sysbar_toggle_bg_on + : R.drawable.sysbar_toggle_bg_off); + } + + void toggleBluetooth() { + if (mBluetoothAdapter == null) return; + if (mBluetoothAdapter.isEnabled()) { + mBluetoothAdapter.disable(); + } else { + mBluetoothAdapter.enable(); + } + } + + void refreshBluetooth() { + boolean on = mBluetoothAdapter != null && mBluetoothAdapter.isEnabled(); + mBluetoothButton.setImageResource(on ? R.drawable.ic_sysbar_bluetooth_on + : R.drawable.ic_sysbar_bluetooth_off); + mBluetoothButton.setBackgroundResource(on + ? R.drawable.sysbar_toggle_bg_on + : R.drawable.sysbar_toggle_bg_off); + } + + private boolean isGpsEnabled() { + ContentResolver res = mContext.getContentResolver(); + return Settings.Secure.isLocationProviderEnabled( + res, LocationManager.GPS_PROVIDER); + } + + private void toggleGps() { + Settings.Secure.setLocationProviderEnabled(mContext.getContentResolver(), + LocationManager.GPS_PROVIDER, !isGpsEnabled()); + } + + private void refreshGps() { + boolean on = isGpsEnabled(); + mGpsButton.setImageResource(on ? R.drawable.ic_sysbar_gps_on + : R.drawable.ic_sysbar_gps_off); + mGpsButton.setBackgroundResource(on + ? R.drawable.sysbar_toggle_bg_on + : R.drawable.sysbar_toggle_bg_off); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java index 312c5f44a807..a7ecb86d1796 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java @@ -58,6 +58,8 @@ public class TabletStatusBarService extends StatusBarService { public static final boolean DEBUG = false; public static final String TAG = "TabletStatusBar"; + private static final int MAX_IMAGE_LEVEL = 10000; + int mIconSize; @@ -78,6 +80,7 @@ public class TabletStatusBarService extends StatusBarService { ImageView mBatteryMeter; ImageView mSignalMeter; + ImageView mSignalIcon; NotificationIconArea.IconLayout mIconLayout; @@ -90,16 +93,13 @@ public class TabletStatusBarService extends StatusBarService { int mDisabled = 0; protected void addPanelWindows() { - mNotificationPanel = View.inflate(this, R.layout.sysbar_panel_notifications, null); - mSystemPanel = (SystemPanel) View.inflate(this, R.layout.sysbar_panel_system, null); - - mNotificationPanel.setVisibility(View.GONE); - mSystemPanel.setVisibility(View.GONE); - final Resources res = getResources(); final int barHeight= res.getDimensionPixelSize( com.android.internal.R.dimen.status_bar_height); + mNotificationPanel = View.inflate(this, R.layout.sysbar_panel_notifications, null); + mNotificationPanel.setVisibility(View.GONE); + WindowManager.LayoutParams lp = new WindowManager.LayoutParams( 400, // ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, @@ -116,8 +116,11 @@ public class TabletStatusBarService extends StatusBarService { WindowManagerImpl.getDefault().addView(mNotificationPanel, lp); + mSystemPanel = (SystemPanel) View.inflate(this, R.layout.sysbar_panel_system, null); + mSystemPanel.setVisibility(View.GONE); + lp = new WindowManager.LayoutParams( - 500, // ViewGroup.LayoutParams.WRAP_CONTENT, + 800, ViewGroup.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL, WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN @@ -158,6 +161,7 @@ public class TabletStatusBarService extends StatusBarService { // System info (center) mBatteryMeter = (ImageView) sb.findViewById(R.id.battery); mSignalMeter = (ImageView) sb.findViewById(R.id.signal); + mSignalIcon = (ImageView) sb.findViewById(R.id.signal_icon); // Add the windows addPanelWindows(); @@ -209,18 +213,23 @@ public class TabletStatusBarService extends StatusBarService { public void setBatteryMeter(int level, boolean plugged) { if (DEBUG) Slog.d(TAG, "battery=" + level + (plugged ? " - plugged" : " - unplugged")); - mBatteryMeter.setImageResource(plugged ? R.drawable.battery_charging : R.drawable.battery); - mBatteryMeter.setImageLevel(level); + mBatteryMeter.setImageResource(R.drawable.sysbar_batterymini); + // adjust percent to permyriad for ClipDrawable's sake + mBatteryMeter.setImageLevel(level * (MAX_IMAGE_LEVEL / 100)); } public void setSignalMeter(int level, boolean isWifi) { if (DEBUG) Slog.d(TAG, "signal=" + level); if (level < 0) { - mSignalMeter.setImageResource(isWifi ? R.drawable.wifi_scan : R.drawable.signal_scan); + mSignalMeter.setImageDrawable(null); mSignalMeter.setImageLevel(0); + mSignalIcon.setImageDrawable(null); } else { - mSignalMeter.setImageResource(isWifi ? R.drawable.wifi : R.drawable.signal); - mSignalMeter.setImageLevel(level); + mSignalMeter.setImageResource(R.drawable.sysbar_wifimini); + // adjust to permyriad + mSignalMeter.setImageLevel(level * (MAX_IMAGE_LEVEL / 100)); + mSignalIcon.setImageResource(isWifi ? R.drawable.ic_sysbar_wifi_mini + : R.drawable.ic_sysbar_wifi_mini); // XXX } } @@ -711,3 +720,5 @@ public class TabletStatusBarService extends StatusBarService { return true; } } + + |
