diff options
53 files changed, 61 insertions, 101 deletions
diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_0.png b/core/res/res/drawable-mdpi/stat_sys_battery_0.png Binary files differindex 4a5e99e..750e652 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_0.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_10.png b/core/res/res/drawable-mdpi/stat_sys_battery_10.png Binary files differdeleted file mode 100755 index b789f23..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_10.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_100.png b/core/res/res/drawable-mdpi/stat_sys_battery_100.png Binary files differindex d280aeb..70d7fa4 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_100.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_100.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_15.png b/core/res/res/drawable-mdpi/stat_sys_battery_15.png Binary files differnew file mode 100644 index 0000000..0eb58e1 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_15.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_20.png b/core/res/res/drawable-mdpi/stat_sys_battery_20.png Binary files differdeleted file mode 100644 index 009a9fd..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_20.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_28.png b/core/res/res/drawable-mdpi/stat_sys_battery_28.png Binary files differnew file mode 100644 index 0000000..f634dde --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_28.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_40.png b/core/res/res/drawable-mdpi/stat_sys_battery_40.png Binary files differdeleted file mode 100644 index 15b57f4..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_40.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_43.png b/core/res/res/drawable-mdpi/stat_sys_battery_43.png Binary files differnew file mode 100644 index 0000000..f0376bd --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_43.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_57.png b/core/res/res/drawable-mdpi/stat_sys_battery_57.png Binary files differnew file mode 100644 index 0000000..840af66 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_57.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_60.png b/core/res/res/drawable-mdpi/stat_sys_battery_60.png Binary files differdeleted file mode 100644 index 21078fd..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_60.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_71.png b/core/res/res/drawable-mdpi/stat_sys_battery_71.png Binary files differnew file mode 100644 index 0000000..04c3569 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_71.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_80.png b/core/res/res/drawable-mdpi/stat_sys_battery_80.png Binary files differdeleted file mode 100644 index 9268f7b..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_80.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_85.png b/core/res/res/drawable-mdpi/stat_sys_battery_85.png Binary files differnew file mode 100644 index 0000000..c742da7 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_85.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png Binary files differindex ff3cabd..957dab3 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png Binary files differdeleted file mode 100644 index b563701..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim1.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim100.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim100.png Binary files differnew file mode 100644 index 0000000..e6d7da0 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim100.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim15.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim15.png Binary files differnew file mode 100644 index 0000000..957dab3 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim15.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png Binary files differdeleted file mode 100644 index 904989e..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim2.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim28.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim28.png Binary files differnew file mode 100644 index 0000000..5aba0bb --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim28.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png Binary files differdeleted file mode 100644 index ba011c9..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim3.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png Binary files differdeleted file mode 100644 index 4f1c485..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim4.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim43.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim43.png Binary files differnew file mode 100644 index 0000000..dc5fac6 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim43.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png Binary files differdeleted file mode 100644 index 4d3396d..0000000 --- a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim5.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim57.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim57.png Binary files differnew file mode 100644 index 0000000..1233ed8 --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim57.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim71.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim71.png Binary files differnew file mode 100644 index 0000000..06d397b --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim71.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim85.png b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim85.png Binary files differnew file mode 100644 index 0000000..1056faf --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_sys_battery_charge_anim85.png diff --git a/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png b/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png Binary files differindex ed72ebf..44eb313 100644 --- a/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png +++ b/core/res/res/drawable-mdpi/stat_sys_battery_unknown.png diff --git a/core/res/res/drawable/stat_sys_battery.xml b/core/res/res/drawable/stat_sys_battery.xml index 968595d..1060375 100644 --- a/core/res/res/drawable/stat_sys_battery.xml +++ b/core/res/res/drawable/stat_sys_battery.xml @@ -20,11 +20,12 @@ <level-list xmlns:android="http://schemas.android.com/apk/res/android"> <item android:maxLevel="4" android:drawable="@android:drawable/stat_sys_battery_0" /> - <item android:maxLevel="14" android:drawable="@android:drawable/stat_sys_battery_10" /> - <item android:maxLevel="29" android:drawable="@android:drawable/stat_sys_battery_20" /> - <item android:maxLevel="49" android:drawable="@android:drawable/stat_sys_battery_40" /> - <item android:maxLevel="69" android:drawable="@android:drawable/stat_sys_battery_60" /> - <item android:maxLevel="89" android:drawable="@android:drawable/stat_sys_battery_80" /> + <item android:maxLevel="15" android:drawable="@android:drawable/stat_sys_battery_15" /> + <item android:maxLevel="35" android:drawable="@android:drawable/stat_sys_battery_28" /> + <item android:maxLevel="49" android:drawable="@android:drawable/stat_sys_battery_43" /> + <item android:maxLevel="60" android:drawable="@android:drawable/stat_sys_battery_57" /> + <item android:maxLevel="75" android:drawable="@android:drawable/stat_sys_battery_71" /> + <item android:maxLevel="90" android:drawable="@android:drawable/stat_sys_battery_85" /> <item android:maxLevel="100" android:drawable="@android:drawable/stat_sys_battery_100" /> </level-list> diff --git a/core/res/res/drawable/stat_sys_battery_charge.xml b/core/res/res/drawable/stat_sys_battery_charge.xml index 92d7c4f..a6c4575 100644 --- a/core/res/res/drawable/stat_sys_battery_charge.xml +++ b/core/res/res/drawable/stat_sys_battery_charge.xml @@ -1,7 +1,5 @@ <?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"); @@ -19,56 +17,14 @@ --> <level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="14"> - <animation-list - xmlns:android="http://schemas.android.com/apk/res/android" - android:oneshot="false"> - <item android:drawable="@drawable/stat_sys_battery_charge_anim0" android:duration="2000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim1" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim2" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim3" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="29"> - <animation-list - xmlns:android="http://schemas.android.com/apk/res/android" - android:oneshot="false"> - <item android:drawable="@drawable/stat_sys_battery_charge_anim1" android:duration="2000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim2" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim3" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="49"> - <animation-list - xmlns:android="http://schemas.android.com/apk/res/android" - android:oneshot="false"> - <item android:drawable="@drawable/stat_sys_battery_charge_anim2" android:duration="2000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim3" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="69"> - <animation-list - xmlns:android="http://schemas.android.com/apk/res/android" - android:oneshot="false"> - <item android:drawable="@drawable/stat_sys_battery_charge_anim3" android:duration="2000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="1000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="89"> - <animation-list - xmlns:android="http://schemas.android.com/apk/res/android" - android:oneshot="false"> - <item android:drawable="@drawable/stat_sys_battery_charge_anim4" android:duration="2000" /> - <item android:drawable="@drawable/stat_sys_battery_charge_anim5" android:duration="1000" /> - </animation-list> - </item> - <item android:maxLevel="101" android:drawable="@drawable/stat_sys_battery_charge_anim5" /> + <item android:maxLevel="4" android:drawable="@android:drawable/stat_sys_battery_charge_anim0" /> + <item android:maxLevel="15" android:drawable="@android:drawable/stat_sys_battery_charge_anim15" /> + <item android:maxLevel="35" android:drawable="@android:drawable/stat_sys_battery_charge_anim28" /> + <item android:maxLevel="49" android:drawable="@android:drawable/stat_sys_battery_charge_anim43" /> + <item android:maxLevel="60" android:drawable="@android:drawable/stat_sys_battery_charge_anim57" /> + <item android:maxLevel="75" android:drawable="@android:drawable/stat_sys_battery_charge_anim71" /> + <item android:maxLevel="90" android:drawable="@android:drawable/stat_sys_battery_charge_anim85" /> + <item android:maxLevel="100" android:drawable="@android:drawable/stat_sys_battery_charge_anim100" /> </level-list> + diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index 6baf5ea..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_default.png Binary files differnew file mode 100644 index 0000000..615c8b6 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_default.png Binary files differnew file mode 100644 index 0000000..0122025 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_pressed.png Binary files differnew file mode 100644 index 0000000..0786916 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_pressed.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_pressed.png Binary files differnew file mode 100644 index 0000000..35f9240 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_pressed.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 differdeleted file mode 100644 index ed813dc..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_default.png Binary files differnew file mode 100644 index 0000000..3eb22df --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_pressed.png Binary files differnew file mode 100644 index 0000000..1ce9bd1 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_pressed.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png Binary files differindex bf33c94..259db7a 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_pressed.png Binary files differnew file mode 100644 index 0000000..993ea55 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_ime_pressed.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 differdeleted file mode 100644 index d7775f2..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_default.png Binary files differnew file mode 100644 index 0000000..fef2cf9 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_pressed.png Binary files differnew file mode 100644 index 0000000..05593bc --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_pressed.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 differdeleted file mode 100644 index 178af73..0000000 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_default.png Binary files differnew file mode 100644 index 0000000..32c2c79 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_default.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_pressed.png Binary files differnew file mode 100644 index 0000000..142c413 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_pressed.png diff --git a/packages/SystemUI/res/drawable/status_bar_menu.xml b/packages/SystemUI/res/drawable/ic_sysbar_back.xml index aa7286e..327ccd8 100644 --- a/packages/SystemUI/res/drawable/status_bar_menu.xml +++ b/packages/SystemUI/res/drawable/ic_sysbar_back.xml @@ -15,7 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/status_bar_menu_pressed" /> - <item android:drawable="@drawable/status_bar_menu_default" /> + <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_back_pressed" /> + <item android:drawable="@drawable/ic_sysbar_back_default" /> </selector> diff --git a/packages/SystemUI/res/drawable/status_bar_home.xml b/packages/SystemUI/res/drawable/ic_sysbar_home.xml index 0011711..f4e585e 100644 --- a/packages/SystemUI/res/drawable/status_bar_home.xml +++ b/packages/SystemUI/res/drawable/ic_sysbar_home.xml @@ -15,7 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/status_bar_home_pressed" /> - <item android:drawable="@drawable/status_bar_home_default" /> + <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_home_pressed" /> + <item android:drawable="@drawable/ic_sysbar_home_default" /> </selector> diff --git a/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml b/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml deleted file mode 100644 index d8ba2a8..0000000 --- a/packages/SystemUI/res/drawable/ic_sysbar_icon_bg.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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/status_bar_back.xml b/packages/SystemUI/res/drawable/ic_sysbar_ime.xml index 92bf147..1accf00 100644 --- a/packages/SystemUI/res/drawable/status_bar_back.xml +++ b/packages/SystemUI/res/drawable/ic_sysbar_ime.xml @@ -15,7 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/status_bar_back_pressed" /> - <item android:drawable="@drawable/status_bar_back_default" /> + <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_ime_pressed" /> + <item android:drawable="@drawable/ic_sysbar_ime_default" /> </selector> diff --git a/packages/SystemUI/res/drawable/status_bar_recent.xml b/packages/SystemUI/res/drawable/ic_sysbar_menu.xml index d708455..7a10607 100755..100644 --- a/packages/SystemUI/res/drawable/status_bar_recent.xml +++ b/packages/SystemUI/res/drawable/ic_sysbar_menu.xml @@ -15,7 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/status_bar_recent_pressed" /> - <item android:drawable="@drawable/status_bar_recent_default" /> + <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_menu_pressed" /> + <item android:drawable="@drawable/ic_sysbar_menu_default" /> </selector> diff --git a/packages/SystemUI/res/drawable/ic_sysbar_recent.xml b/packages/SystemUI/res/drawable/ic_sysbar_recent.xml new file mode 100755 index 0000000..39a324b --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_sysbar_recent.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/ic_sysbar_recent_pressed" /> + <item android:drawable="@drawable/ic_sysbar_recent_default" /> +</selector> + diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml index 3292a92..4fa306e 100644 --- a/packages/SystemUI/res/layout-xlarge/status_bar.xml +++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml @@ -39,7 +39,6 @@ android:id="@+id/notificationIcons" android:layout_width="wrap_content" android:layout_height="match_parent" - android:gravity="center_vertical" android:orientation="horizontal" > <view @@ -47,7 +46,9 @@ android:id="@+id/icons" android:layout_width="wrap_content" android:layout_height="@*android:dimen/status_bar_icon_size" - android:layout_marginLeft="8dip" + android:layout_gravity="top" + android:layout_marginTop="5dp" + android:layout_marginLeft="8dp" /> </com.android.systemui.statusbar.tablet.NotificationIconArea> @@ -84,13 +85,15 @@ android:id="@+id/battery" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_gravity="center_vertical" + android:layout_gravity="top" + android:layout_marginTop="18dp" /> <ImageView android:id="@+id/network" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_gravity="center_vertical" + android:layout_gravity="top" + android:layout_marginTop="14dp" android:src="@drawable/ic_sysbar_wifi_mini" /> </LinearLayout> @@ -112,7 +115,6 @@ android:paddingLeft="18dip" android:paddingRight="18dip" android:src="@drawable/ic_sysbar_back" - android:background="@drawable/ic_sysbar_icon_bg" systemui:keyCode="4" /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" @@ -121,14 +123,13 @@ android:paddingLeft="18dip" android:paddingRight="18dip" android:src="@drawable/ic_sysbar_home" - android:background="@drawable/ic_sysbar_icon_bg" systemui:keyCode="3" /> <ImageButton android:id="@+id/recent_apps" android:layout_width="96dip" android:layout_height="match_parent" android:src="@drawable/ic_sysbar_recent" - android:background="@drawable/ic_sysbar_icon_bg" + android:background="@null" android:paddingLeft="18dip" android:clickable="true" android:paddingRight="18dip" @@ -139,7 +140,6 @@ android:paddingLeft="18dip" android:paddingRight="18dip" android:src="@drawable/ic_sysbar_menu" - android:background="@drawable/ic_sysbar_icon_bg" systemui:keyCode="82" android:visibility="invisible" /> @@ -147,7 +147,6 @@ android:id="@+id/pocket" android:layout_width="96dip" android:layout_height="match_parent" - android:background="@drawable/ic_sysbar_icon_bg" android:paddingLeft="18dip" android:paddingRight="18dip" android:animateLayoutChanges="true" @@ -169,8 +168,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_marginLeft="8dip" - android:src="@drawable/ic_sysbar_ime_default" - android:background="@drawable/ic_sysbar_icon_bg" + android:src="@drawable/ic_sysbar_ime" android:visibility="invisible" /> </LinearLayout> diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java index 40883bd..47599c8 100644 --- a/services/java/com/android/server/BatteryService.java +++ b/services/java/com/android/server/BatteryService.java @@ -473,10 +473,15 @@ class BatteryService extends Binder { private final int getIcon(int level) { if (mBatteryStatus == BatteryManager.BATTERY_STATUS_CHARGING) { return com.android.internal.R.drawable.stat_sys_battery_charge; - } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_DISCHARGING || - mBatteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING || - mBatteryStatus == BatteryManager.BATTERY_STATUS_FULL) { + } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_DISCHARGING) { return com.android.internal.R.drawable.stat_sys_battery; + } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING + || mBatteryStatus == BatteryManager.BATTERY_STATUS_FULL) { + if (isPowered() && mBatteryLevel >= 100) { + return com.android.internal.R.drawable.stat_sys_battery_charge; + } else { + return com.android.internal.R.drawable.stat_sys_battery; + } } else { return com.android.internal.R.drawable.stat_sys_battery_unknown; } |
