diff options
author | Joe Onorato <joeo@android.com> | 2010-05-27 16:39:00 -0400 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2010-06-02 14:48:45 -0700 |
commit | 798ac4c7d79534a8230623b737b5b1b6a415d105 (patch) | |
tree | 969db0c76992419b9a45a8b558c9c94383f54c36 | |
parent | 79de0c550037a5328bbc7f4fddaf02f192a5c283 (diff) | |
download | frameworks_base-798ac4c7d79534a8230623b737b5b1b6a415d105.zip frameworks_base-798ac4c7d79534a8230623b737b5b1b6a415d105.tar.gz frameworks_base-798ac4c7d79534a8230623b737b5b1b6a415d105.tar.bz2 |
Start moving resources to SystemUI.apk.
Change-Id: Ibf30b8196d65d7fbca1177968cefa5f7a875bf1d
-rw-r--r-- | core/java/android/app/StatusBarManager.java | 9 | ||||
-rw-r--r-- | core/res/res/drawable-hdpi/battery_charge_fill_empty.9.png | bin | 783 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-hdpi/battery_charge_fill_full.9.png | bin | 756 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-hdpi/battery_charge_fill_warning.9.png | bin | 819 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png | bin | 1246 -> 818 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/battery_charge_fill_empty.9.png | bin | 3384 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/battery_charge_fill_full.9.png | bin | 3409 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable-mdpi/battery_charge_fill_warning.9.png | bin | 3427 -> 0 bytes | |||
-rw-r--r-- | core/res/res/drawable/battery_charge_fill.xml | 22 | ||||
-rw-r--r-- | core/res/res/layout/battery_status.xml | 81 | ||||
-rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
-rw-r--r-- | core/res/res/values/strings.xml | 22 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/battery_low_battery.png (renamed from core/res/res/drawable-hdpi/battery_low_battery.png) | bin | 4759 -> 4759 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_notify_alarm.png (renamed from core/res/res/drawable-hdpi/stat_notify_alarm.png) | bin | 1793 -> 1793 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png | bin | 0 -> 1246 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png) | bin | 1405 -> 1405 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_connected_1x.png) | bin | 1349 -> 1349 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_connected_3g.png) | bin | 1257 -> 1257 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_connected_e.png) | bin | 1216 -> 1216 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_connected_g.png) | bin | 1212 -> 1212 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_connected_h.png) | bin | 1165 -> 1165 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_in_1x.png) | bin | 1326 -> 1326 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_in_3g.png) | bin | 1226 -> 1226 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_in_e.png) | bin | 1179 -> 1179 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_in_g.png) | bin | 1181 -> 1181 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_in_h.png) | bin | 1148 -> 1148 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_inandout_1x.png) | bin | 1292 -> 1292 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_inandout_3g.png) | bin | 1190 -> 1190 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_inandout_e.png) | bin | 1135 -> 1135 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_inandout_g.png) | bin | 1143 -> 1143 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_inandout_h.png) | bin | 1103 -> 1103 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_out_1x.png) | bin | 1324 -> 1324 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_out_3g.png) | bin | 1220 -> 1220 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_out_e.png) | bin | 1171 -> 1171 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_out_g.png) | bin | 1178 -> 1178 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png (renamed from core/res/res/drawable-hdpi/stat_sys_data_out_h.png) | bin | 1135 -> 1135 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_gps_acquiring.png (renamed from core/res/res/drawable-hdpi/stat_sys_gps_acquiring.png) | bin | 884 -> 884 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png (renamed from core/res/res/drawable-hdpi/stat_sys_no_sim.png) | bin | 1021 -> 1021 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0.png (renamed from core/res/res/drawable-hdpi/stat_sys_r_signal_0.png) | bin | 1223 -> 1223 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1.png (renamed from core/res/res/drawable-hdpi/stat_sys_r_signal_1.png) | bin | 1239 -> 1239 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2.png (renamed from core/res/res/drawable-hdpi/stat_sys_r_signal_2.png) | bin | 1231 -> 1231 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3.png (renamed from core/res/res/drawable-hdpi/stat_sys_r_signal_3.png) | bin | 1206 -> 1206 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4.png (renamed from core/res/res/drawable-hdpi/stat_sys_r_signal_4.png) | bin | 1151 -> 1151 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_silent.png (renamed from core/res/res/drawable-hdpi/stat_sys_ringer_silent.png) | bin | 1300 -> 1300 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_vibrate.png (renamed from core/res/res/drawable-hdpi/stat_sys_ringer_vibrate.png) | bin | 4980 -> 4980 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_0.png (renamed from core/res/res/drawable-hdpi/stat_sys_roaming_cdma_0.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png (renamed from core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png) | bin | 142 -> 142 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png (renamed from core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png (renamed from core/res/res/drawable-hdpi/stat_sys_signal_0.png) | bin | 1058 -> 1058 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png (renamed from core/res/res/drawable-hdpi/stat_sys_signal_1.png) | bin | 1070 -> 1070 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png (renamed from core/res/res/drawable-hdpi/stat_sys_signal_2.png) | bin | 1070 -> 1070 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png (renamed from core/res/res/drawable-hdpi/stat_sys_signal_3.png) | bin | 1042 -> 1042 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png (renamed from core/res/res/drawable-hdpi/stat_sys_signal_4.png) | bin | 986 -> 986 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png (renamed from core/res/res/drawable-hdpi/stat_sys_signal_flightmode.png) | bin | 1492 -> 1492 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png (renamed from core/res/res/drawable-hdpi/stat_sys_signal_null.png) | bin | 1304 -> 1304 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_tty_mode.png (renamed from core/res/res/drawable-hdpi/stat_sys_tty_mode.png) | bin | 400 -> 400 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png (renamed from core/res/res/drawable-hdpi/stat_sys_wifi_signal_0.png) | bin | 1217 -> 1217 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png (renamed from core/res/res/drawable-hdpi/stat_sys_wifi_signal_1.png) | bin | 1229 -> 1229 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png (renamed from core/res/res/drawable-hdpi/stat_sys_wifi_signal_2.png) | bin | 1239 -> 1239 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png (renamed from core/res/res/drawable-hdpi/stat_sys_wifi_signal_3.png) | bin | 1240 -> 1240 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png (renamed from core/res/res/drawable-hdpi/stat_sys_wifi_signal_4.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/battery_low_battery.png (renamed from core/res/res/drawable-mdpi/battery_low_battery.png) | bin | 5306 -> 5306 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_notify_alarm.png (renamed from core/res/res/drawable-mdpi/stat_notify_alarm.png) | bin | 1035 -> 1035 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png) | bin | 967 -> 967 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_connected_1x.png) | bin | 892 -> 892 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_connected_3g.png) | bin | 832 -> 832 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_connected_e.png) | bin | 833 -> 833 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_connected_g.png) | bin | 838 -> 838 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_connected_h.png) | bin | 642 -> 642 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_in_1x.png) | bin | 808 -> 808 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_in_3g.png) | bin | 757 -> 757 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_in_e.png) | bin | 719 -> 719 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_in_g.png) | bin | 724 -> 724 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_in_h.png) | bin | 669 -> 669 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_inandout_1x.png) | bin | 770 -> 770 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_inandout_3g.png) | bin | 709 -> 709 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_inandout_e.png) | bin | 682 -> 682 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_inandout_g.png) | bin | 683 -> 683 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_inandout_h.png) | bin | 655 -> 655 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_out_1x.png) | bin | 820 -> 820 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_out_3g.png) | bin | 768 -> 768 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_out_e.png) | bin | 735 -> 735 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_out_g.png) | bin | 739 -> 739 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png (renamed from core/res/res/drawable-mdpi/stat_sys_data_out_h.png) | bin | 654 -> 654 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_gps_acquiring.png (renamed from core/res/res/drawable-mdpi/stat_sys_gps_acquiring.png) | bin | 595 -> 595 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png (renamed from core/res/res/drawable-mdpi/stat_sys_no_sim.png) | bin | 809 -> 809 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png (renamed from core/res/res/drawable-mdpi/stat_sys_r_signal_0.png) | bin | 802 -> 802 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png (renamed from core/res/res/drawable-mdpi/stat_sys_r_signal_1.png) | bin | 818 -> 818 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png (renamed from core/res/res/drawable-mdpi/stat_sys_r_signal_2.png) | bin | 802 -> 802 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png (renamed from core/res/res/drawable-mdpi/stat_sys_r_signal_3.png) | bin | 798 -> 798 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png (renamed from core/res/res/drawable-mdpi/stat_sys_r_signal_4.png) | bin | 726 -> 726 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png (renamed from core/res/res/drawable-mdpi/stat_sys_ringer_silent.png) | bin | 767 -> 767 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png (renamed from core/res/res/drawable-mdpi/stat_sys_ringer_vibrate.png) | bin | 1255 -> 1255 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_0.png (renamed from core/res/res/drawable-mdpi/stat_sys_roaming_cdma_0.png) | bin | 377 -> 377 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png (renamed from core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png) | bin | 150 -> 150 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png (renamed from core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png) | bin | 377 -> 377 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png (renamed from core/res/res/drawable-mdpi/stat_sys_signal_0.png) | bin | 587 -> 587 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png (renamed from core/res/res/drawable-mdpi/stat_sys_signal_1.png) | bin | 597 -> 597 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png (renamed from core/res/res/drawable-mdpi/stat_sys_signal_2.png) | bin | 595 -> 595 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png (renamed from core/res/res/drawable-mdpi/stat_sys_signal_3.png) | bin | 594 -> 594 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png (renamed from core/res/res/drawable-mdpi/stat_sys_signal_4.png) | bin | 532 -> 532 bytes | |||
-rwxr-xr-x | packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png (renamed from core/res/res/drawable-mdpi/stat_sys_signal_flightmode.png) | bin | 898 -> 898 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png (renamed from core/res/res/drawable-mdpi/stat_sys_signal_null.png) | bin | 730 -> 730 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_tty_mode.png (renamed from core/res/res/drawable-mdpi/stat_sys_tty_mode.png) | bin | 725 -> 725 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png (renamed from core/res/res/drawable-mdpi/stat_sys_wifi_signal_0.png) | bin | 743 -> 743 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png (renamed from core/res/res/drawable-mdpi/stat_sys_wifi_signal_1.png) | bin | 768 -> 768 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png (renamed from core/res/res/drawable-mdpi/stat_sys_wifi_signal_2.png) | bin | 785 -> 785 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png (renamed from core/res/res/drawable-mdpi/stat_sys_wifi_signal_3.png) | bin | 807 -> 807 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png (renamed from core/res/res/drawable-mdpi/stat_sys_wifi_signal_4.png) | bin | 826 -> 826 bytes | |||
-rw-r--r-- | packages/SystemUI/res/drawable/stat_sys_gps_acquiring_anim.xml (renamed from core/res/res/drawable/stat_sys_gps_acquiring_anim.xml) | 2 | ||||
-rw-r--r-- | packages/SystemUI/res/drawable/stat_sys_roaming_cdma_flash.xml (renamed from core/res/res/drawable/stat_sys_roaming_cdma_flash.xml) | 0 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/battery_low.xml (renamed from core/res/res/layout/battery_low.xml) | 0 | ||||
-rw-r--r-- | packages/SystemUI/res/values/config.xml | 26 | ||||
-rw-r--r-- | packages/SystemUI/res/values/strings.xml | 16 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java | 6 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java (renamed from services/java/com/android/server/status/StatusBarPolicy.java) | 427 | ||||
-rw-r--r-- | services/java/com/android/server/SystemServer.java | 6 |
117 files changed, 236 insertions, 384 deletions
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 962de02..de544fb 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -123,4 +123,13 @@ public class StatusBarManager { throw new RuntimeException(ex); } } + + public void setIconVisibility(String slot, boolean visible) { + try { + mService.setIconVisibility(slot, visible); + } catch (RemoteException ex) { + // system process is dead anyway. + throw new RuntimeException(ex); + } + } } diff --git a/core/res/res/drawable-hdpi/battery_charge_fill_empty.9.png b/core/res/res/drawable-hdpi/battery_charge_fill_empty.9.png Binary files differdeleted file mode 100644 index c4e70a8..0000000 --- a/core/res/res/drawable-hdpi/battery_charge_fill_empty.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/battery_charge_fill_full.9.png b/core/res/res/drawable-hdpi/battery_charge_fill_full.9.png Binary files differdeleted file mode 100644 index ac66f5a..0000000 --- a/core/res/res/drawable-hdpi/battery_charge_fill_full.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/battery_charge_fill_warning.9.png b/core/res/res/drawable-hdpi/battery_charge_fill_warning.9.png Binary files differdeleted file mode 100644 index 32d99c6..0000000 --- a/core/res/res/drawable-hdpi/battery_charge_fill_warning.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png b/core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png Binary files differindex 96dc085..7a8b78f 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png +++ b/core/res/res/drawable-hdpi/stat_sys_data_bluetooth.png diff --git a/core/res/res/drawable-mdpi/battery_charge_fill_empty.9.png b/core/res/res/drawable-mdpi/battery_charge_fill_empty.9.png Binary files differdeleted file mode 100644 index 9ed20ba..0000000 --- a/core/res/res/drawable-mdpi/battery_charge_fill_empty.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/battery_charge_fill_full.9.png b/core/res/res/drawable-mdpi/battery_charge_fill_full.9.png Binary files differdeleted file mode 100644 index 8e6aaca..0000000 --- a/core/res/res/drawable-mdpi/battery_charge_fill_full.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/battery_charge_fill_warning.9.png b/core/res/res/drawable-mdpi/battery_charge_fill_warning.9.png Binary files differdeleted file mode 100644 index d3287db..0000000 --- a/core/res/res/drawable-mdpi/battery_charge_fill_warning.9.png +++ /dev/null diff --git a/core/res/res/drawable/battery_charge_fill.xml b/core/res/res/drawable/battery_charge_fill.xml deleted file mode 100644 index 7f65733..0000000 --- a/core/res/res/drawable/battery_charge_fill.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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. ---> - -<level-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:maxLevel="29" android:drawable="@android:drawable/battery_charge_fill_empty" /> - <item android:maxLevel="49" android:drawable="@android:drawable/battery_charge_fill_warning" /> - <item android:maxLevel="100" android:drawable="@android:drawable/battery_charge_fill_full" /> -</level-list> - diff --git a/core/res/res/layout/battery_status.xml b/core/res/res/layout/battery_status.xml deleted file mode 100644 index 7cfec05..0000000 --- a/core/res/res/layout/battery_status.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?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. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/frame" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center_horizontal" - > - - <FrameLayout - android:layout_width="141px" - android:layout_height="184px" - android:background="@drawable/battery_charge_background" - android:paddingTop="25px" - android:paddingLeft="1px" - > - - <LinearLayout - android:id="@+id/meter" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - > - - <ImageView - android:layout_width="match_parent" - android:layout_height="15dip" - /> - <ImageView - android:id="@+id/spacer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> - <ImageView - android:id="@+id/level" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - /> - - </LinearLayout> - - <TextView android:id="@+id/level_percent" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:textStyle="bold" - android:textSize="48dp" - android:textColor="#ffffffff" - android:gravity="center" - /> - </FrameLayout> - - <TextView android:id="@+id/status" - android:paddingTop="35dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:textStyle="bold" - android:textSize="30dp" - android:textColor="#ffffffff" - android:gravity="center_horizontal" - android:text="@string/battery_status_charging" - /> - -</LinearLayout> - - diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 64f05fe..cd47ae9 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -220,9 +220,6 @@ <!-- Allow the menu hard key to be disabled in LockScreen on some devices --> <bool name="config_disableMenuKeyInLockScreen">false</bool> - <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices --> - <bool name="config_hspa_data_distinguishable">false</bool> - <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support. The N entries of this array define N + 1 zones as follows: diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 3434dca..613a9a2 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1567,28 +1567,6 @@ <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). --> <string name="hour_cap_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="PM">%p</xliff:g>"</string> - <!-- The big percent text in the middle of the battery icon that appears when you plug in - the charger. --> - <string name="battery_status_text_percent_format"><xliff:g id="number" example="50">%d</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string> - - <!-- The big percent text in the middle of the battery icon that appears when you plug in - the charger. This indicates the current status of the battery. --> - <string name="battery_status_charging">Charging\u2026</string> - - <!-- When the battery is low, this is displayed to the user in a dialog. The title of the low battery alert. --> - <string name="battery_low_title">Please connect charger</string> - - <!-- When the battery is low, this is displayed to the user in a dialog. The subtitle of the low battery alert. --> - <string name="battery_low_subtitle">The battery is getting low:</string> - - <!-- A message that appears when the battery level is getting low in a dialog. This is appened to the subtitle of the low battery alert. --> - <string name="battery_low_percent_format"><xliff:g id="number">%d%%</xliff:g> - or less remaining.</string> - - <!-- When the battery is low, this is the label of the button to go to the - power usage activity to find out what drained the battery. --> - <string name="battery_low_why">Battery use</string> - <!-- Title of the alert when something went wrong in the factory test. --> <string name="factorytest_failed">Factory test failed</string> <!-- Error message displayed when a non-system application tries to start a factory test. --> diff --git a/core/res/res/drawable-hdpi/battery_low_battery.png b/packages/SystemUI/res/drawable-hdpi/battery_low_battery.png Binary files differindex d894f7b..d894f7b 100644 --- a/core/res/res/drawable-hdpi/battery_low_battery.png +++ b/packages/SystemUI/res/drawable-hdpi/battery_low_battery.png diff --git a/core/res/res/drawable-hdpi/stat_notify_alarm.png b/packages/SystemUI/res/drawable-hdpi/stat_notify_alarm.png Binary files differindex 89daee1..89daee1 100644 --- a/core/res/res/drawable-hdpi/stat_notify_alarm.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_notify_alarm.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png Binary files differnew file mode 100644 index 0000000..96dc085 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png Binary files differindex 1e4bbf5..1e4bbf5 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png Binary files differindex 12d4ac4..12d4ac4 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_connected_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png Binary files differindex 4f1f377..4f1f377 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_connected_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png Binary files differindex c65f56a..c65f56a 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_connected_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png Binary files differindex 4aca0c7..4aca0c7 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_connected_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png Binary files differindex 24e07ab..24e07ab 100755 --- a/core/res/res/drawable-hdpi/stat_sys_data_connected_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_in_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png Binary files differindex 511e22a..511e22a 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_in_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_in_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png Binary files differindex 64f8087..64f8087 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_in_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_in_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png Binary files differindex 90aaf71..90aaf71 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_in_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_in_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png Binary files differindex c21387e..c21387e 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_in_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_in_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png Binary files differindex f2f6daa..f2f6daa 100755 --- a/core/res/res/drawable-hdpi/stat_sys_data_in_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png Binary files differindex 19ea80c..19ea80c 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_inandout_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png Binary files differindex ebfa6fb..ebfa6fb 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_inandout_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png Binary files differindex 7ccd7de..7ccd7de 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_inandout_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png Binary files differindex c614d0d..c614d0d 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_inandout_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_inandout_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png Binary files differindex 5d6ef05..5d6ef05 100755 --- a/core/res/res/drawable-hdpi/stat_sys_data_inandout_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_out_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png Binary files differindex adf5f95..adf5f95 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_out_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_out_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png Binary files differindex 9936f2a..9936f2a 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_out_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_out_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png Binary files differindex 904c565..904c565 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_out_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_out_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png Binary files differindex 1261c15..1261c15 100644 --- a/core/res/res/drawable-hdpi/stat_sys_data_out_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png diff --git a/core/res/res/drawable-hdpi/stat_sys_data_out_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png Binary files differindex 5e3122d..5e3122d 100755 --- a/core/res/res/drawable-hdpi/stat_sys_data_out_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png diff --git a/core/res/res/drawable-hdpi/stat_sys_gps_acquiring.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_acquiring.png Binary files differindex 9003d67..9003d67 100644 --- a/core/res/res/drawable-hdpi/stat_sys_gps_acquiring.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_acquiring.png diff --git a/core/res/res/drawable-hdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png Binary files differindex 157491e..157491e 100644 --- a/core/res/res/drawable-hdpi/stat_sys_no_sim.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_no_sim.png diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0.png Binary files differindex 95ba181..95ba181 100644 --- a/core/res/res/drawable-hdpi/stat_sys_r_signal_0.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_0.png diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1.png Binary files differindex adf668d..adf668d 100644 --- a/core/res/res/drawable-hdpi/stat_sys_r_signal_1.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1.png diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2.png Binary files differindex 7bf6b51..7bf6b51 100644 --- a/core/res/res/drawable-hdpi/stat_sys_r_signal_2.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2.png diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3.png Binary files differindex 78738ac..78738ac 100644 --- a/core/res/res/drawable-hdpi/stat_sys_r_signal_3.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3.png diff --git a/core/res/res/drawable-hdpi/stat_sys_r_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4.png Binary files differindex ac88143..ac88143 100644 --- a/core/res/res/drawable-hdpi/stat_sys_r_signal_4.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4.png diff --git a/core/res/res/drawable-hdpi/stat_sys_ringer_silent.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_silent.png Binary files differindex bdd37e1..bdd37e1 100644 --- a/core/res/res/drawable-hdpi/stat_sys_ringer_silent.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_silent.png diff --git a/core/res/res/drawable-hdpi/stat_sys_ringer_vibrate.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_vibrate.png Binary files differindex 21c1c08..21c1c08 100644 --- a/core/res/res/drawable-hdpi/stat_sys_ringer_vibrate.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_ringer_vibrate.png diff --git a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_0.png Binary files differindex adde938..adde938 100644 --- a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_0.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_0.png diff --git a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png Binary files differindex 245677b..245677b 100644 --- a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim0.png diff --git a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png Binary files differindex adde938..adde938 100644 --- a/core/res/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png Binary files differindex 3e317dd..3e317dd 100644 --- a/core/res/res/drawable-hdpi/stat_sys_signal_0.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0.png diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png Binary files differindex 72329f8..72329f8 100644 --- a/core/res/res/drawable-hdpi/stat_sys_signal_1.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1.png diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png Binary files differindex 558c49c..558c49c 100644 --- a/core/res/res/drawable-hdpi/stat_sys_signal_2.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2.png diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png Binary files differindex 6440bdd..6440bdd 100644 --- a/core/res/res/drawable-hdpi/stat_sys_signal_3.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3.png diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png Binary files differindex fe20423..fe20423 100644 --- a/core/res/res/drawable-hdpi/stat_sys_signal_4.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4.png diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png Binary files differindex 7a419f1..7a419f1 100644 --- a/core/res/res/drawable-hdpi/stat_sys_signal_flightmode.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_flightmode.png diff --git a/core/res/res/drawable-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png Binary files differindex 1adc05a..1adc05a 100644 --- a/core/res/res/drawable-hdpi/stat_sys_signal_null.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png diff --git a/core/res/res/drawable-hdpi/stat_sys_tty_mode.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_tty_mode.png Binary files differindex 4e161c6..4e161c6 100644 --- a/core/res/res/drawable-hdpi/stat_sys_tty_mode.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_tty_mode.png diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png Binary files differindex 55a2ad8..55a2ad8 100644 --- a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_0.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png Binary files differindex d16b3e8..d16b3e8 100644 --- a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_1.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png Binary files differindex 2511083..2511083 100644 --- a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_2.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png Binary files differindex e0799a5..e0799a5 100644 --- a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_3.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png diff --git a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png Binary files differindex 2385c3a..2385c3a 100644 --- a/core/res/res/drawable-hdpi/stat_sys_wifi_signal_4.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png diff --git a/core/res/res/drawable-mdpi/battery_low_battery.png b/packages/SystemUI/res/drawable-mdpi/battery_low_battery.png Binary files differindex 60bbe6c..60bbe6c 100644 --- a/core/res/res/drawable-mdpi/battery_low_battery.png +++ b/packages/SystemUI/res/drawable-mdpi/battery_low_battery.png diff --git a/core/res/res/drawable-mdpi/stat_notify_alarm.png b/packages/SystemUI/res/drawable-mdpi/stat_notify_alarm.png Binary files differindex 1b01b85..1b01b85 100644 --- a/core/res/res/drawable-mdpi/stat_notify_alarm.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_notify_alarm.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png Binary files differindex f09b83b..f09b83b 100755 --- a/core/res/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth_connected.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png Binary files differindex 130724f..130724f 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_connected_1x.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_1x.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png Binary files differindex a109280..a109280 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_connected_3g.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_3g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png Binary files differindex c552644..c552644 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_connected_e.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_e.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png Binary files differindex f7edb49..f7edb49 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_connected_g.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png Binary files differindex 7d5413a..7d5413a 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_connected_h.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_h.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_in_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png Binary files differindex 3155e632..3155e632 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_in_1x.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_1x.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_in_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png Binary files differindex 01b003c..01b003c 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_in_3g.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_3g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_in_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png Binary files differindex bffa0eb..bffa0eb 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_in_e.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_e.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_in_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png Binary files differindex 8884b48..8884b48 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_in_g.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_in_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png Binary files differindex 695b80c..695b80c 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_in_h.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_in_h.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_inandout_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png Binary files differindex 1017e3b..1017e3b 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_inandout_1x.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_1x.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_inandout_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png Binary files differindex 3651300..3651300 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_inandout_3g.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_3g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_inandout_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png Binary files differindex 99533e0..99533e0 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_inandout_e.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_e.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_inandout_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png Binary files differindex f4e5a12..f4e5a12 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_inandout_g.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_inandout_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png Binary files differindex 467acd1..467acd1 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_inandout_h.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_inandout_h.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_out_1x.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png Binary files differindex 5418791..5418791 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_out_1x.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_1x.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_out_3g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png Binary files differindex f7f0f89..f7f0f89 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_out_3g.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_3g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_out_e.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png Binary files differindex c915426..c915426 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_out_e.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_e.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_out_g.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png Binary files differindex 5d36035..5d36035 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_out_g.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_g.png diff --git a/core/res/res/drawable-mdpi/stat_sys_data_out_h.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png Binary files differindex da50305..da50305 100644 --- a/core/res/res/drawable-mdpi/stat_sys_data_out_h.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_out_h.png diff --git a/core/res/res/drawable-mdpi/stat_sys_gps_acquiring.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_gps_acquiring.png Binary files differindex 31bc94e..31bc94e 100644 --- a/core/res/res/drawable-mdpi/stat_sys_gps_acquiring.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_gps_acquiring.png diff --git a/core/res/res/drawable-mdpi/stat_sys_no_sim.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png Binary files differindex 2134d49..2134d49 100644 --- a/core/res/res/drawable-mdpi/stat_sys_no_sim.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_no_sim.png diff --git a/core/res/res/drawable-mdpi/stat_sys_r_signal_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png Binary files differindex bfbf18e..bfbf18e 100644 --- a/core/res/res/drawable-mdpi/stat_sys_r_signal_0.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_r_signal_1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png Binary files differindex 896ba4d..896ba4d 100644 --- a/core/res/res/drawable-mdpi/stat_sys_r_signal_1.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_1.png diff --git a/core/res/res/drawable-mdpi/stat_sys_r_signal_2.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png Binary files differindex af79eff..af79eff 100644 --- a/core/res/res/drawable-mdpi/stat_sys_r_signal_2.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_2.png diff --git a/core/res/res/drawable-mdpi/stat_sys_r_signal_3.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png Binary files differindex 92c09c8..92c09c8 100644 --- a/core/res/res/drawable-mdpi/stat_sys_r_signal_3.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_3.png diff --git a/core/res/res/drawable-mdpi/stat_sys_r_signal_4.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png Binary files differindex f04fb11..f04fb11 100644 --- a/core/res/res/drawable-mdpi/stat_sys_r_signal_4.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_r_signal_4.png diff --git a/core/res/res/drawable-mdpi/stat_sys_ringer_silent.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png Binary files differindex d62f32d..d62f32d 100644 --- a/core/res/res/drawable-mdpi/stat_sys_ringer_silent.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_silent.png diff --git a/core/res/res/drawable-mdpi/stat_sys_ringer_vibrate.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png Binary files differindex 665ca38..665ca38 100644 --- a/core/res/res/drawable-mdpi/stat_sys_ringer_vibrate.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_ringer_vibrate.png diff --git a/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_0.png Binary files differindex c61cce7..c61cce7 100755 --- a/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_0.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png Binary files differindex d62502d..d62502d 100755 --- a/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png Binary files differindex c61cce7..c61cce7 100755 --- a/core/res/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png diff --git a/core/res/res/drawable-mdpi/stat_sys_signal_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png Binary files differindex cb7b7b3..cb7b7b3 100644 --- a/core/res/res/drawable-mdpi/stat_sys_signal_0.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_signal_1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png Binary files differindex 5376e92..5376e92 100644 --- a/core/res/res/drawable-mdpi/stat_sys_signal_1.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1.png diff --git a/core/res/res/drawable-mdpi/stat_sys_signal_2.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png Binary files differindex fd54363..fd54363 100644 --- a/core/res/res/drawable-mdpi/stat_sys_signal_2.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2.png diff --git a/core/res/res/drawable-mdpi/stat_sys_signal_3.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png Binary files differindex 6c4873a..6c4873a 100644 --- a/core/res/res/drawable-mdpi/stat_sys_signal_3.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3.png diff --git a/core/res/res/drawable-mdpi/stat_sys_signal_4.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png Binary files differindex a3320cb..a3320cb 100644 --- a/core/res/res/drawable-mdpi/stat_sys_signal_4.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4.png diff --git a/core/res/res/drawable-mdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png Binary files differindex 2f4fd4f..2f4fd4f 100755 --- a/core/res/res/drawable-mdpi/stat_sys_signal_flightmode.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_flightmode.png diff --git a/core/res/res/drawable-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png Binary files differindex 5aa23f6..5aa23f6 100644 --- a/core/res/res/drawable-mdpi/stat_sys_signal_null.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png diff --git a/core/res/res/drawable-mdpi/stat_sys_tty_mode.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_tty_mode.png Binary files differindex ed157a8..ed157a8 100644 --- a/core/res/res/drawable-mdpi/stat_sys_tty_mode.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_tty_mode.png diff --git a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png Binary files differindex 8ee3421..8ee3421 100644 --- a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_0.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_0.png diff --git a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png Binary files differindex 184fa36..184fa36 100644 --- a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_1.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1.png diff --git a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png Binary files differindex 79935bb..79935bb 100644 --- a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_2.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2.png diff --git a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png Binary files differindex d2099e6..d2099e6 100644 --- a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_3.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3.png diff --git a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png Binary files differindex 2062aad..2062aad 100644 --- a/core/res/res/drawable-mdpi/stat_sys_wifi_signal_4.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4.png diff --git a/core/res/res/drawable/stat_sys_gps_acquiring_anim.xml b/packages/SystemUI/res/drawable/stat_sys_gps_acquiring_anim.xml index 954c19c..393697c 100644 --- a/core/res/res/drawable/stat_sys_gps_acquiring_anim.xml +++ b/packages/SystemUI/res/drawable/stat_sys_gps_acquiring_anim.xml @@ -21,5 +21,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false"> <item android:drawable="@drawable/stat_sys_gps_acquiring" android:duration="500" /> - <item android:drawable="@drawable/stat_sys_gps_on" android:duration="500" /> + <item android:drawable="@*android:drawable/stat_sys_gps_on" android:duration="500" /> </animation-list> diff --git a/core/res/res/drawable/stat_sys_roaming_cdma_flash.xml b/packages/SystemUI/res/drawable/stat_sys_roaming_cdma_flash.xml index 07dc446..07dc446 100644 --- a/core/res/res/drawable/stat_sys_roaming_cdma_flash.xml +++ b/packages/SystemUI/res/drawable/stat_sys_roaming_cdma_flash.xml diff --git a/core/res/res/layout/battery_low.xml b/packages/SystemUI/res/layout/battery_low.xml index 3b62fb0..3b62fb0 100644 --- a/core/res/res/layout/battery_low.xml +++ b/packages/SystemUI/res/layout/battery_low.xml diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml new file mode 100644 index 0000000..8ea46e5 --- /dev/null +++ b/packages/SystemUI/res/values/config.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources> + <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices --> + <bool name="config_hspa_data_distinguishable">false</bool> +</resources> + diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8e42b59..ba3a3d1 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -16,7 +16,7 @@ * limitations under the License. */ --> -<resources> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Name of the status bar as seen in the applications info settings page. --> <string name="app_label">Status Bar</string> @@ -37,4 +37,18 @@ the status bar. Recently received text messsages (SMS), emails, calendar alerts, etc. --> <string name="status_bar_latest_events_title">Notifications</string> + <!-- When the battery is low, this is displayed to the user in a dialog. The title of the low battery alert. --> + <string name="battery_low_title">Please connect charger</string> + + <!-- When the battery is low, this is displayed to the user in a dialog. The subtitle of the low battery alert. --> + <string name="battery_low_subtitle">The battery is getting low:</string> + + <!-- A message that appears when the battery level is getting low in a dialog. This is appened to the subtitle of the low battery alert. --> + <string name="battery_low_percent_format"><xliff:g id="number">%d%%</xliff:g> + or less remaining.</string> + + <!-- When the battery is low, this is the label of the button to go to the + power usage activity to find out what drained the battery. --> + <string name="battery_low_why">Battery use</string> + </resources> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java index 925095e..e7d8282 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/PhoneStatusBarService.java @@ -72,6 +72,7 @@ import java.util.HashMap; import java.util.Set; import com.android.systemui.R; +import com.android.systemui.statusbar.policy.StatusBarPolicy; public class PhoneStatusBarService extends StatusBarService { static final String TAG = "PhoneStatusBarService"; @@ -111,6 +112,8 @@ public class PhoneStatusBarService extends StatusBarService { return super.dispatchKeyEvent(event); } } + + StatusBarPolicy mIconPolicy; int mHeight; int mIconWidth; @@ -199,6 +202,9 @@ public class PhoneStatusBarService extends StatusBarService { // Next, call super.onCreate(), which will populate our views. super.onCreate(); + + // Lastly, call to the icon policy to install/update all the icons. + mIconPolicy = new StatusBarPolicy(this); } // ================================================================================ diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java index b90897b..9ef9d0d 100644 --- a/services/java/com/android/server/status/StatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.android.server.status; +package com.android.systemui.statusbar.policy; +import android.app.StatusBarManager; import android.app.AlertDialog; import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothAdapter; @@ -64,7 +65,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.internal.R; import com.android.internal.app.IBatteryStats; import com.android.internal.telephony.IccCard; import com.android.internal.telephony.TelephonyIntents; @@ -72,16 +72,16 @@ import com.android.internal.telephony.cdma.EriInfo; import com.android.internal.telephony.cdma.TtyIntent; import com.android.server.am.BatteryStatsService; +import com.android.systemui.R; + /** * This class contains all of the policy about which icons are installed in the status - * bar at boot time. In reality, it should go into the android.policy package, but - * putting it here is the first step from extracting it. + * bar at boot time. It goes through the normal API for icons, even though it probably + * strictly doesn't need to. */ public class StatusBarPolicy { private static final String TAG = "StatusBarPolicy"; - private static StatusBarPolicy sInstance; - // message codes for the handler private static final int EVENT_BATTERY_CLOSE = 4; @@ -92,7 +92,7 @@ public class StatusBarPolicy { private static final int AM_PM_STYLE = AM_PM_STYLE_GONE; private final Context mContext; - private final StatusBarManagerService mService; + private final StatusBarManager mService; private final Handler mHandler = new StatusBarHandler(); private final IBatteryStats mBatteryStats; @@ -118,115 +118,115 @@ public class StatusBarPolicy { //***** Signal strength icons //GSM/UMTS private static final int[] sSignalImages = new int[] { - com.android.internal.R.drawable.stat_sys_signal_0, - com.android.internal.R.drawable.stat_sys_signal_1, - com.android.internal.R.drawable.stat_sys_signal_2, - com.android.internal.R.drawable.stat_sys_signal_3, - com.android.internal.R.drawable.stat_sys_signal_4 + R.drawable.stat_sys_signal_0, + R.drawable.stat_sys_signal_1, + R.drawable.stat_sys_signal_2, + R.drawable.stat_sys_signal_3, + R.drawable.stat_sys_signal_4 }; private static final int[] sSignalImages_r = new int[] { - com.android.internal.R.drawable.stat_sys_r_signal_0, - com.android.internal.R.drawable.stat_sys_r_signal_1, - com.android.internal.R.drawable.stat_sys_r_signal_2, - com.android.internal.R.drawable.stat_sys_r_signal_3, - com.android.internal.R.drawable.stat_sys_r_signal_4 + R.drawable.stat_sys_r_signal_0, + R.drawable.stat_sys_r_signal_1, + R.drawable.stat_sys_r_signal_2, + R.drawable.stat_sys_r_signal_3, + R.drawable.stat_sys_r_signal_4 }; private static final int[] sRoamingIndicatorImages_cdma = new int[] { - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, //Standard Roaming Indicator + R.drawable.stat_sys_roaming_cdma_0, //Standard Roaming Indicator // 1 is Standard Roaming Indicator OFF // TODO T: image never used, remove and put 0 instead? - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, // 2 is Standard Roaming Indicator FLASHING // TODO T: image never used, remove and put 0 instead? - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, // 3-12 Standard ERI - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, //3 - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, //3 + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, // 13-63 Reserved for Standard ERI - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, //13 - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, //13 + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, // 64-127 Reserved for Non Standard (Operator Specific) ERI - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, //64 - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0, - com.android.internal.R.drawable.stat_sys_roaming_cdma_0 //83 + R.drawable.stat_sys_roaming_cdma_0, //64 + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0, + R.drawable.stat_sys_roaming_cdma_0 //83 // 128-255 Reserved }; @@ -235,38 +235,38 @@ public class StatusBarPolicy { private int[] mDataIconList = sDataNetType_g; //GSM/UMTS private static final int[] sDataNetType_g = new int[] { - com.android.internal.R.drawable.stat_sys_data_connected_g, - com.android.internal.R.drawable.stat_sys_data_in_g, - com.android.internal.R.drawable.stat_sys_data_out_g, - com.android.internal.R.drawable.stat_sys_data_inandout_g, + R.drawable.stat_sys_data_connected_g, + R.drawable.stat_sys_data_in_g, + R.drawable.stat_sys_data_out_g, + R.drawable.stat_sys_data_inandout_g, }; private static final int[] sDataNetType_3g = new int[] { - com.android.internal.R.drawable.stat_sys_data_connected_3g, - com.android.internal.R.drawable.stat_sys_data_in_3g, - com.android.internal.R.drawable.stat_sys_data_out_3g, - com.android.internal.R.drawable.stat_sys_data_inandout_3g, + R.drawable.stat_sys_data_connected_3g, + R.drawable.stat_sys_data_in_3g, + R.drawable.stat_sys_data_out_3g, + R.drawable.stat_sys_data_inandout_3g, }; private static final int[] sDataNetType_e = new int[] { - com.android.internal.R.drawable.stat_sys_data_connected_e, - com.android.internal.R.drawable.stat_sys_data_in_e, - com.android.internal.R.drawable.stat_sys_data_out_e, - com.android.internal.R.drawable.stat_sys_data_inandout_e, + R.drawable.stat_sys_data_connected_e, + R.drawable.stat_sys_data_in_e, + R.drawable.stat_sys_data_out_e, + R.drawable.stat_sys_data_inandout_e, }; //3.5G private static final int[] sDataNetType_h = new int[] { - com.android.internal.R.drawable.stat_sys_data_connected_h, - com.android.internal.R.drawable.stat_sys_data_in_h, - com.android.internal.R.drawable.stat_sys_data_out_h, - com.android.internal.R.drawable.stat_sys_data_inandout_h, + R.drawable.stat_sys_data_connected_h, + R.drawable.stat_sys_data_in_h, + R.drawable.stat_sys_data_out_h, + R.drawable.stat_sys_data_inandout_h, }; //CDMA // Use 3G icons for EVDO data and 1x icons for 1XRTT data private static final int[] sDataNetType_1x = new int[] { - com.android.internal.R.drawable.stat_sys_data_connected_1x, - com.android.internal.R.drawable.stat_sys_data_in_1x, - com.android.internal.R.drawable.stat_sys_data_out_1x, - com.android.internal.R.drawable.stat_sys_data_inandout_1x, + R.drawable.stat_sys_data_connected_1x, + R.drawable.stat_sys_data_in_1x, + R.drawable.stat_sys_data_out_1x, + R.drawable.stat_sys_data_inandout_1x, }; // Assume it's all good unless we hear otherwise. We don't always seem @@ -293,13 +293,13 @@ public class StatusBarPolicy { // wifi private static final int[] sWifiSignalImages = new int[] { - com.android.internal.R.drawable.stat_sys_wifi_signal_1, - com.android.internal.R.drawable.stat_sys_wifi_signal_2, - com.android.internal.R.drawable.stat_sys_wifi_signal_3, - com.android.internal.R.drawable.stat_sys_wifi_signal_4, + R.drawable.stat_sys_wifi_signal_1, + R.drawable.stat_sys_wifi_signal_2, + R.drawable.stat_sys_wifi_signal_3, + R.drawable.stat_sys_wifi_signal_4, }; private static final int sWifiTemporarilyNotConnectedImage = - com.android.internal.R.drawable.stat_sys_wifi_signal_0; + R.drawable.stat_sys_wifi_signal_0; private int mLastWifiSignalLevel = -1; private boolean mIsWifiConnected = false; @@ -356,9 +356,9 @@ public class StatusBarPolicy { } }; - private StatusBarPolicy(Context context, StatusBarManagerService service) { + public StatusBarPolicy(Context context) { mContext = context; - mService = service; + mService = (StatusBarManager)context.getSystemService(Context.STATUS_BAR_SERVICE); mSignalStrength = new SignalStrength(); mBatteryStats = BatteryStatsService.getService(); @@ -368,13 +368,12 @@ public class StatusBarPolicy { new com.android.server.status.StorageNotification(context)); // battery - service.setIcon("battery", - null, com.android.internal.R.drawable.stat_sys_battery_unknown, 0); + mService.setIcon("battery", com.android.internal.R.drawable.stat_sys_battery_unknown, 0); // phone_signal mPhone = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE); - mPhoneSignalIconId = com.android.internal.R.drawable.stat_sys_signal_null; - service.setIcon("phone_signal", null, mPhoneSignalIconId, 0); + mPhoneSignalIconId = R.drawable.stat_sys_signal_null; + mService.setIcon("phone_signal", mPhoneSignalIconId, 0); // register for phone state notifications. ((TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE)) @@ -386,27 +385,24 @@ public class StatusBarPolicy { | PhoneStateListener.LISTEN_DATA_ACTIVITY); // data_connection - service.setIcon("data_connection", - null, com.android.internal.R.drawable.stat_sys_data_connected_g, 0); - service.setIconVisibility("data_connection", false); + mService.setIcon("data_connection", R.drawable.stat_sys_data_connected_g, 0); + mService.setIconVisibility("data_connection", false); // wifi - service.setIcon("wifi", null, sWifiSignalImages[0], 0); - service.setIconVisibility("wifi", false); + mService.setIcon("wifi", sWifiSignalImages[0], 0); + mService.setIconVisibility("wifi", false); // wifi will get updated by the sticky intents // TTY status - service.setIcon("tty", null, com.android.internal.R.drawable.stat_sys_tty_mode, 0); - service.setIconVisibility("tty", false); + mService.setIcon("tty", R.drawable.stat_sys_tty_mode, 0); + mService.setIconVisibility("tty", false); // Cdma Roaming Indicator, ERI - service.setIcon("cdma_eri", - null, com.android.internal.R.drawable.stat_sys_roaming_cdma_0, 0); - service.setIconVisibility("cdma_eri", false); + mService.setIcon("cdma_eri", R.drawable.stat_sys_roaming_cdma_0, 0); + mService.setIconVisibility("cdma_eri", false); // bluetooth status - service.setIcon("bluetooth", - null, com.android.internal.R.drawable.stat_sys_data_bluetooth, 0); + mService.setIcon("bluetooth", R.drawable.stat_sys_data_bluetooth, 0); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); if (adapter != null) { mBluetoothEnabled = adapter.isEnabled(); @@ -419,23 +415,22 @@ public class StatusBarPolicy { mService.setIconVisibility("bluetooth", mBluetoothEnabled); // Gps status - service.setIcon("gps", - null, com.android.internal.R.drawable.stat_sys_gps_acquiring_anim, 0); - service.setIconVisibility("gps", false); + mService.setIcon("gps", R.drawable.stat_sys_gps_acquiring_anim, 0); + mService.setIconVisibility("gps", false); // Alarm clock - service.setIcon("alarm_clock", null, com.android.internal.R.drawable.stat_notify_alarm, 0); - service.setIconVisibility("alarm_clock", false); + mService.setIcon("alarm_clock", R.drawable.stat_notify_alarm, 0); + mService.setIconVisibility("alarm_clock", false); // Sync state - service.setIcon("sync_active", null, R.drawable.stat_notify_sync_anim0, 0); - service.setIcon("sync_failing", null, R.drawable.stat_notify_sync_error, 0); - service.setIconVisibility("sync_active", false); - service.setIconVisibility("sync_failing", false); + mService.setIcon("sync_active", com.android.internal.R.drawable.stat_notify_sync_anim0, 0); + mService.setIcon("sync_failing", com.android.internal.R.drawable.stat_notify_sync_error, 0); + mService.setIconVisibility("sync_active", false); + mService.setIconVisibility("sync_failing", false); // volume - service.setIcon("volume", null, com.android.internal.R.drawable.stat_sys_ringer_silent, 0); - service.setIconVisibility("volume", false); + mService.setIcon("volume", R.drawable.stat_sys_ringer_silent, 0); + mService.setIconVisibility("volume", false); updateVolume(); IntentFilter filter = new IntentFilter(); @@ -466,16 +461,12 @@ public class StatusBarPolicy { // load config to determine if to distinguish Hspa data icon try { mHspaDataDistinguishable = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_hspa_data_distinguishable); + R.bool.config_hspa_data_distinguishable); } catch (Exception e) { mHspaDataDistinguishable = false; } } - public static void installIcons(Context context, StatusBarManagerService service) { - sInstance = new StatusBarPolicy(context, service); - } - private final void updateAlarm(Intent intent) { boolean alarmSet = intent.getBooleanExtra("alarmSet", false); mService.setIconVisibility("alarm_clock", alarmSet); @@ -492,7 +483,7 @@ public class StatusBarPolicy { private final void updateBattery(Intent intent) { final int id = intent.getIntExtra("icon-small", 0); int level = intent.getIntExtra("level", 0); - mService.setIcon("battery", null, id, level); + mService.setIcon("battery", id, level); boolean plugged = intent.getIntExtra("plugged", 0) != 0; level = intent.getIntExtra("level", -1); @@ -519,12 +510,6 @@ public class StatusBarPolicy { * the device does not charge when plugged into USB (since he/she would * not see the same battery screen on USB as he sees on brick). */ - /* else { - if (plugged && !oldPlugged) { - showBatteryView(); - } - } - */ if (false) { Slog.d(TAG, "plugged=" + plugged + " oldPlugged=" + oldPlugged + " level=" + level); } @@ -554,58 +539,6 @@ public class StatusBarPolicy { } } - private void showBatteryView() { - closeLastBatteryView(); - if (mLowBatteryDialog != null) { - mLowBatteryDialog.dismiss(); - } - - int level = mBatteryLevel; - - View v = View.inflate(mContext, com.android.internal.R.layout.battery_status, null); - mBatteryView = v; - int pixelFormat = PixelFormat.TRANSLUCENT; - Drawable bg = v.getBackground(); - if (bg != null) { - pixelFormat = bg.getOpacity(); - } - - int flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE - | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE - | WindowManager.LayoutParams.FLAG_DIM_BEHIND; - - if (!mContext.getResources().getBoolean( - com.android.internal.R.bool.config_sf_slowBlur)) { - flags |= WindowManager.LayoutParams.FLAG_BLUR_BEHIND; - } - - WindowManager.LayoutParams lp = new WindowManager.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT, - WindowManager.LayoutParams.TYPE_TOAST, - flags, pixelFormat); - - // Get the dim amount from the theme - TypedArray a = mContext.obtainStyledAttributes( - com.android.internal.R.styleable.Theme); - lp.dimAmount = a.getFloat(android.R.styleable.Theme_backgroundDimAmount, 0.5f); - a.recycle(); - - lp.setTitle("Battery"); - - TextView levelTextView = (TextView)v.findViewById(com.android.internal.R.id.level_percent); - levelTextView.setText(mContext.getString( - com.android.internal.R.string.battery_status_text_percent_format, level)); - - setBatteryLevel(v, com.android.internal.R.id.spacer, 100-level, 0, 0); - setBatteryLevel(v, com.android.internal.R.id.level, level, - com.android.internal.R.drawable.battery_charge_fill, level); - - WindowManagerImpl.getDefault().addView(v, lp); - - scheduleCloseBatteryView(); - } - private void setBatteryLevel(View parent, int id, int height, int background, int level) { ImageView v = (ImageView)parent.findViewById(id); LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)v.getLayoutParams(); @@ -622,19 +555,19 @@ public class StatusBarPolicy { // Show exact battery level. CharSequence levelText = mContext.getString( - com.android.internal.R.string.battery_low_percent_format, mBatteryLevel); + R.string.battery_low_percent_format, mBatteryLevel); if (mBatteryLevelTextView != null) { mBatteryLevelTextView.setText(levelText); } else { - View v = View.inflate(mContext, com.android.internal.R.layout.battery_low, null); - mBatteryLevelTextView=(TextView)v.findViewById(com.android.internal.R.id.level_percent); + View v = View.inflate(mContext, R.layout.battery_low, null); + mBatteryLevelTextView=(TextView)v.findViewById(R.id.level_percent); mBatteryLevelTextView.setText(levelText); AlertDialog.Builder b = new AlertDialog.Builder(mContext); b.setCancelable(true); - b.setTitle(com.android.internal.R.string.battery_low_title); + b.setTitle(R.string.battery_low_title); b.setView(v); b.setIcon(android.R.drawable.ic_dialog_alert); b.setPositiveButton(android.R.string.ok, null); @@ -645,7 +578,7 @@ public class StatusBarPolicy { | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS | Intent.FLAG_ACTIVITY_NO_HISTORY); if (intent.resolveActivity(mContext.getPackageManager()) != null) { - b.setNegativeButton(com.android.internal.R.string.battery_low_why, + b.setNegativeButton(R.string.battery_low_why, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { mContext.startActivity(intent); @@ -826,11 +759,11 @@ public class StatusBarPolicy { //Slog.d(TAG, "updateSignalStrength: no service"); if (Settings.System.getInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) == 1) { - mPhoneSignalIconId = com.android.internal.R.drawable.stat_sys_signal_flightmode; + mPhoneSignalIconId = R.drawable.stat_sys_signal_flightmode; } else { - mPhoneSignalIconId = com.android.internal.R.drawable.stat_sys_signal_null; + mPhoneSignalIconId = R.drawable.stat_sys_signal_null; } - mService.setIcon("phone_signal", null, mPhoneSignalIconId, 0); + mService.setIcon("phone_signal", mPhoneSignalIconId, 0); return; } @@ -869,7 +802,7 @@ public class StatusBarPolicy { } } mPhoneSignalIconId = iconList[iconLevel]; - mService.setIcon("phone_signal", null, mPhoneSignalIconId, 0); + mService.setIcon("phone_signal", mPhoneSignalIconId, 0); } private int getCdmaLevel() { @@ -972,13 +905,13 @@ public class StatusBarPolicy { iconId = mDataIconList[0]; break; } - mService.setIcon("data_connection", null, iconId, 0); + mService.setIcon("data_connection", iconId, 0); } else { visible = false; } } else { - iconId = com.android.internal.R.drawable.stat_sys_no_sim; - mService.setIcon("data_connection", null, iconId, 0); + iconId = R.drawable.stat_sys_no_sim; + mService.setIcon("data_connection", iconId, 0); } } else { // CDMA case, mDataActivity can be also DATA_ACTIVITY_DORMANT @@ -998,7 +931,7 @@ public class StatusBarPolicy { iconId = mDataIconList[0]; break; } - mService.setIcon("data_connection", null, iconId, 0); + mService.setIcon("data_connection", iconId, 0); } else { visible = false; } @@ -1024,11 +957,11 @@ public class StatusBarPolicy { final boolean visible = ringerMode == AudioManager.RINGER_MODE_SILENT || ringerMode == AudioManager.RINGER_MODE_VIBRATE; final int iconId = audioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER) - ? com.android.internal.R.drawable.stat_sys_ringer_vibrate - : com.android.internal.R.drawable.stat_sys_ringer_silent; + ? R.drawable.stat_sys_ringer_vibrate + : R.drawable.stat_sys_ringer_silent; if (visible) { - mService.setIcon("volume", null, iconId, 0); + mService.setIcon("volume", iconId, 0); } if (visible != mVolumeVisible) { mService.setIconVisibility("volume", visible); @@ -1037,7 +970,7 @@ public class StatusBarPolicy { } private final void updateBluetooth(Intent intent) { - int iconId = com.android.internal.R.drawable.stat_sys_data_bluetooth; + int iconId = R.drawable.stat_sys_data_bluetooth; String action = intent.getAction(); if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) { int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR); @@ -1061,10 +994,10 @@ public class StatusBarPolicy { if (mBluetoothHeadsetState == BluetoothHeadset.STATE_CONNECTED || mBluetoothA2dpConnected || mBluetoothPbapState == BluetoothPbap.STATE_CONNECTED) { - iconId = com.android.internal.R.drawable.stat_sys_data_bluetooth_connected; + iconId = R.drawable.stat_sys_data_bluetooth_connected; } - mService.setIcon("bluetooth", null, iconId, 0); + mService.setIcon("bluetooth", iconId, 0); mService.setIconVisibility("bluetooth", mBluetoothEnabled); } @@ -1112,7 +1045,7 @@ public class StatusBarPolicy { mService.setIconVisibility("wifi", false); } - mService.setIcon("wifi", null, iconId, 0); + mService.setIcon("wifi", iconId, 0); } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) { int iconId; final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200); @@ -1125,7 +1058,7 @@ public class StatusBarPolicy { } else { iconId = sWifiTemporarilyNotConnectedImage; } - mService.setIcon("wifi", null, iconId, 0); + mService.setIcon("wifi", iconId, 0); } } } @@ -1136,15 +1069,14 @@ public class StatusBarPolicy { if (action.equals(LocationManager.GPS_FIX_CHANGE_ACTION) && enabled) { // GPS is getting fixes - mService.setIcon("gps", null, com.android.internal.R.drawable.stat_sys_gps_on, 0); + mService.setIcon("gps", com.android.internal.R.drawable.stat_sys_gps_on, 0); mService.setIconVisibility("gps", true); } else if (action.equals(LocationManager.GPS_ENABLED_CHANGE_ACTION) && !enabled) { // GPS is off mService.setIconVisibility("gps", false); } else { // GPS is on, but not receiving fixes - mService.setIcon("gps", - null, com.android.internal.R.drawable.stat_sys_gps_acquiring_anim, 0); + mService.setIcon("gps", R.drawable.stat_sys_gps_acquiring_anim, 0); mService.setIconVisibility("gps", true); } } @@ -1158,7 +1090,7 @@ public class StatusBarPolicy { if (enabled) { // TTY is on if (false) Slog.v(TAG, "updateTTY: set TTY on"); - mService.setIcon("tty", null, com.android.internal.R.drawable.stat_sys_tty_mode, 0); + mService.setIcon("tty", R.drawable.stat_sys_tty_mode, 0); mService.setIconVisibility("tty", true); } else { // TTY is off @@ -1200,17 +1132,16 @@ public class StatusBarPolicy { switch (iconMode) { case EriInfo.ROAMING_ICON_MODE_NORMAL: - mService.setIcon("cdma_eri", null, iconList[iconIndex], 0); + mService.setIcon("cdma_eri", iconList[iconIndex], 0); mService.setIconVisibility("cdma_eri", true); break; case EriInfo.ROAMING_ICON_MODE_FLASH: - mService.setIcon("cdma_eri", - null, com.android.internal.R.drawable.stat_sys_roaming_cdma_flash, 0); + mService.setIcon("cdma_eri", R.drawable.stat_sys_roaming_cdma_flash, 0); mService.setIconVisibility("cdma_eri", true); break; } - mService.setIcon("phone_signal", null, mPhoneSignalIconId, 0); + mService.setIcon("phone_signal", mPhoneSignalIconId, 0); } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index d7948ec..4307cdc 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -405,12 +405,6 @@ class ServerThread extends Thread { } try { - com.android.server.status.StatusBarPolicy.installIcons(context, statusBar); - } catch (Throwable e) { - Slog.e(TAG, "Failure installing status bar icons", e); - } - - try { Slog.i(TAG, "DiskStats Service"); ServiceManager.addService("diskstats", new DiskStatsService(context)); } catch (Throwable e) { |