Merge "Misc fixes to CryptKeeper"
diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png
deleted file mode 100644
index 3b29eae..0000000
--- a/res/drawable-hdpi/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_bg_focused_holo.9.png b/res/drawable-hdpi/appwidget_bg_focused_holo.9.png
new file mode 100644
index 0000000..2953631
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_bg_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_bg_holo.9.png b/res/drawable-hdpi/appwidget_bg_holo.9.png
new file mode 100644
index 0000000..829e656
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_bg_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_bg_pressed_holo.9.png b/res/drawable-hdpi/appwidget_bg_pressed_holo.9.png
new file mode 100644
index 0000000..4166892
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_bg_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_c.9.png b/res/drawable-hdpi/appwidget_inner_focus_c.9.png
deleted file mode 100644
index a949bd2..0000000
--- a/res/drawable-hdpi/appwidget_inner_focus_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_l.9.png b/res/drawable-hdpi/appwidget_inner_focus_l.9.png
deleted file mode 100644
index 4aaca6c..0000000
--- a/res/drawable-hdpi/appwidget_inner_focus_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focus_r.9.png b/res/drawable-hdpi/appwidget_inner_focus_r.9.png
deleted file mode 100644
index 1fc0f90..0000000
--- a/res/drawable-hdpi/appwidget_inner_focus_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png
new file mode 100644
index 0000000..5aafacd
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png
new file mode 100644
index 0000000..bc30a63
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png
new file mode 100644
index 0000000..f510079
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_c.9.png b/res/drawable-hdpi/appwidget_inner_press_c.9.png
deleted file mode 100644
index ca6f16c..0000000
--- a/res/drawable-hdpi/appwidget_inner_press_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_l.9.png b/res/drawable-hdpi/appwidget_inner_press_l.9.png
deleted file mode 100644
index 642eb3d..0000000
--- a/res/drawable-hdpi/appwidget_inner_press_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_press_r.9.png b/res/drawable-hdpi/appwidget_inner_press_r.9.png
deleted file mode 100644
index 5e1f70a..0000000
--- a/res/drawable-hdpi/appwidget_inner_press_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
new file mode 100644
index 0000000..470f5c0
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
new file mode 100644
index 0000000..e51db4d
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
new file mode 100644
index 0000000..68fb46b
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_divider.9.png b/res/drawable-hdpi/appwidget_settings_divider.9.png
deleted file mode 100644
index 01a03bf..0000000
--- a/res/drawable-hdpi/appwidget_settings_divider.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_divider_holo.9.png b/res/drawable-hdpi/appwidget_settings_divider_holo.9.png
new file mode 100644
index 0000000..02b4b8b
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_divider_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png
deleted file mode 100644
index 7b053c8..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
new file mode 100644
index 0000000..dbbf15c
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png
deleted file mode 100644
index 97e00f6..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
new file mode 100644
index 0000000..6e772d1
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png
deleted file mode 100644
index 2922fc3..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
new file mode 100644
index 0000000..03d95f0
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png
deleted file mode 100644
index 10b0296..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png
new file mode 100644
index 0000000..875c5f9
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png
deleted file mode 100644
index 5f21734..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png
new file mode 100644
index 0000000..2fc328b
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png
deleted file mode 100644
index c7d5dd7..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png
new file mode 100644
index 0000000..213bc4c
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png
deleted file mode 100644
index 8b9872b..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
new file mode 100644
index 0000000..84737ea
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png
deleted file mode 100644
index 0c80f61..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
new file mode 100644
index 0000000..f15709e
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png
deleted file mode 100644
index f1f0b3d..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
new file mode 100644
index 0000000..a92d8e4
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_grid_border.9.png b/res/drawable-hdpi/data_grid_border.9.png
index e0110b6..e963917 100644
--- a/res/drawable-hdpi/data_grid_border.9.png
+++ b/res/drawable-hdpi/data_grid_border.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_grid_primary.9.png b/res/drawable-hdpi/data_grid_primary.9.png
index a2b7b82..de0acf0 100644
--- a/res/drawable-hdpi/data_grid_primary.9.png
+++ b/res/drawable-hdpi/data_grid_primary.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_grid_secondary.9.png b/res/drawable-hdpi/data_grid_secondary.9.png
index f13bf78..9a69574 100644
--- a/res/drawable-hdpi/data_grid_secondary.9.png
+++ b/res/drawable-hdpi/data_grid_secondary.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_left_activated.9.png b/res/drawable-hdpi/data_sweep_left_activated.9.png
index 28efd35..df8dc10 100644
--- a/res/drawable-hdpi/data_sweep_left_activated.9.png
+++ b/res/drawable-hdpi/data_sweep_left_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_left_default.9.png b/res/drawable-hdpi/data_sweep_left_default.9.png
index 4b6f2df..dd1205a 100644
--- a/res/drawable-hdpi/data_sweep_left_default.9.png
+++ b/res/drawable-hdpi/data_sweep_left_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_limit_activated.9.png b/res/drawable-hdpi/data_sweep_limit_activated.9.png
index 59de0d3..f946d79 100644
--- a/res/drawable-hdpi/data_sweep_limit_activated.9.png
+++ b/res/drawable-hdpi/data_sweep_limit_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_limit_default.9.png b/res/drawable-hdpi/data_sweep_limit_default.9.png
index d7f3a88..25fb4fd 100644
--- a/res/drawable-hdpi/data_sweep_limit_default.9.png
+++ b/res/drawable-hdpi/data_sweep_limit_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_right_activated.9.png b/res/drawable-hdpi/data_sweep_right_activated.9.png
index ccd7ff9..44b9a91 100644
--- a/res/drawable-hdpi/data_sweep_right_activated.9.png
+++ b/res/drawable-hdpi/data_sweep_right_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_right_default.9.png b/res/drawable-hdpi/data_sweep_right_default.9.png
index 1179fde..becc0cd 100644
--- a/res/drawable-hdpi/data_sweep_right_default.9.png
+++ b/res/drawable-hdpi/data_sweep_right_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_warning_activated.9.png b/res/drawable-hdpi/data_sweep_warning_activated.9.png
index 9ecd28b..d4c9930 100644
--- a/res/drawable-hdpi/data_sweep_warning_activated.9.png
+++ b/res/drawable-hdpi/data_sweep_warning_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_warning_default.9.png b/res/drawable-hdpi/data_sweep_warning_default.9.png
index ec2b9df..68381ef 100644
--- a/res/drawable-hdpi/data_sweep_warning_default.9.png
+++ b/res/drawable-hdpi/data_sweep_warning_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png
deleted file mode 100644
index d8fa90b..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png
new file mode 100644
index 0000000..bfa2d51
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png
deleted file mode 100644
index 459ff18..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
new file mode 100644
index 0000000..2a84db0
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png
deleted file mode 100644
index 14c3e04..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
new file mode 100644
index 0000000..8b91582
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
new file mode 100644
index 0000000..c5044bc
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png
new file mode 100644
index 0000000..7053fc7
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png
deleted file mode 100644
index 1bbde2d..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png
new file mode 100644
index 0000000..0f25e1f
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png
deleted file mode 100644
index 296ccb3..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png
deleted file mode 100644
index bb037bc..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_gps_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png
new file mode 100644
index 0000000..cd3c61e
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png
deleted file mode 100644
index 75ae817..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
new file mode 100644
index 0000000..1b1666a
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_off.png b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png
deleted file mode 100644
index 636f0cc..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_sync_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png
new file mode 100644
index 0000000..1c9079e
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_on.png b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png
deleted file mode 100644
index 8ecf159..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_sync_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
new file mode 100644
index 0000000..135c4dc
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png
deleted file mode 100644
index f0c9afd..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png
new file mode 100644
index 0000000..9f36c40
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png
deleted file mode 100644
index 66fae12..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
new file mode 100644
index 0000000..bdb2bf3
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_sync_anim0.png b/res/drawable-hdpi/ic_list_sync_anim0.png
deleted file mode 100755
index dc78905..0000000
--- a/res/drawable-hdpi/ic_list_sync_anim0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_sync_anim1.png b/res/drawable-hdpi/ic_list_sync_anim1.png
deleted file mode 100755
index 5fe6b4f..0000000
--- a/res/drawable-hdpi/ic_list_sync_anim1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_sync_anim2.png b/res/drawable-hdpi/ic_list_sync_anim2.png
deleted file mode 100755
index d9d68ed..0000000
--- a/res/drawable-hdpi/ic_list_sync_anim2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_sync_anim3.png b/res/drawable-hdpi/ic_list_sync_anim3.png
deleted file mode 100755
index 7275c29..0000000
--- a/res/drawable-hdpi/ic_list_sync_anim3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_anim_holo.png b/res/drawable-hdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..bc8dc58
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_anim_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_error.png b/res/drawable-hdpi/ic_sync_error.png
new file mode 100644
index 0000000..914d44d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_error.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_error_holo.png b/res/drawable-hdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..3e34bd0
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_error_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_green_holo.png b/res/drawable-hdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..2588f3d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_green_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_grey_holo.png b/res/drawable-hdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..4c7060d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_grey_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_red_holo.png b/res/drawable-hdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..b65520d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_red_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png
deleted file mode 100644
index afe41b6..0000000
--- a/res/drawable-mdpi/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg_focused_holo.9.png b/res/drawable-mdpi/appwidget_bg_focused_holo.9.png
new file mode 100644
index 0000000..19a12cd
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_bg_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg_holo.9.png b/res/drawable-mdpi/appwidget_bg_holo.9.png
new file mode 100644
index 0000000..5cd3a61
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_bg_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg_pressed_holo.9.png b/res/drawable-mdpi/appwidget_bg_pressed_holo.9.png
new file mode 100644
index 0000000..e3f186f
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_bg_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_c.9.png b/res/drawable-mdpi/appwidget_inner_focus_c.9.png
deleted file mode 100644
index 1450e65..0000000
--- a/res/drawable-mdpi/appwidget_inner_focus_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_l.9.png b/res/drawable-mdpi/appwidget_inner_focus_l.9.png
deleted file mode 100644
index 6e8f100..0000000
--- a/res/drawable-mdpi/appwidget_inner_focus_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focus_r.9.png b/res/drawable-mdpi/appwidget_inner_focus_r.9.png
deleted file mode 100644
index 604256e..0000000
--- a/res/drawable-mdpi/appwidget_inner_focus_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png
new file mode 100644
index 0000000..cc50fe9
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png
new file mode 100644
index 0000000..1475b3e
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png
new file mode 100644
index 0000000..0005829
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_c.9.png b/res/drawable-mdpi/appwidget_inner_press_c.9.png
deleted file mode 100644
index bd542ba..0000000
--- a/res/drawable-mdpi/appwidget_inner_press_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_l.9.png b/res/drawable-mdpi/appwidget_inner_press_l.9.png
deleted file mode 100644
index 575ecf4..0000000
--- a/res/drawable-mdpi/appwidget_inner_press_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_press_r.9.png b/res/drawable-mdpi/appwidget_inner_press_r.9.png
deleted file mode 100644
index 6d7bf29..0000000
--- a/res/drawable-mdpi/appwidget_inner_press_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
new file mode 100644
index 0000000..aa80a7c
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
new file mode 100644
index 0000000..0f27d8d
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
new file mode 100644
index 0000000..255e2d4
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_divider.9.png b/res/drawable-mdpi/appwidget_settings_divider.9.png
deleted file mode 100644
index 73c9a27..0000000
--- a/res/drawable-mdpi/appwidget_settings_divider.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_divider_holo.9.png b/res/drawable-mdpi/appwidget_settings_divider_holo.9.png
new file mode 100644
index 0000000..64cf53e
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_divider_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png
deleted file mode 100644
index fee031d..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
new file mode 100644
index 0000000..3b27803
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png
deleted file mode 100644
index 6549420..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
new file mode 100644
index 0000000..a7bd60b
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png
deleted file mode 100644
index ab12452..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
new file mode 100644
index 0000000..a60a7a4
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png
deleted file mode 100644
index d9440f3..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png
new file mode 100644
index 0000000..552616c
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png
deleted file mode 100644
index a10a47a..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png
new file mode 100644
index 0000000..735403c
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png
deleted file mode 100644
index ce766d0..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png
new file mode 100644
index 0000000..f348c13
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png
deleted file mode 100644
index 72a8623..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
new file mode 100644
index 0000000..7d98a6e
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png
deleted file mode 100644
index 75f6f74..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
new file mode 100644
index 0000000..58357d0
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png
deleted file mode 100644
index 0f8975c..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
new file mode 100644
index 0000000..b63ca40
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_grid_border.9.png b/res/drawable-mdpi/data_grid_border.9.png
index 85912b8..ac6b034 100644
--- a/res/drawable-mdpi/data_grid_border.9.png
+++ b/res/drawable-mdpi/data_grid_border.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_grid_primary.9.png b/res/drawable-mdpi/data_grid_primary.9.png
index 0aa9143..491f156 100644
--- a/res/drawable-mdpi/data_grid_primary.9.png
+++ b/res/drawable-mdpi/data_grid_primary.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_grid_secondary.9.png b/res/drawable-mdpi/data_grid_secondary.9.png
index 7a09593..9a69574 100644
--- a/res/drawable-mdpi/data_grid_secondary.9.png
+++ b/res/drawable-mdpi/data_grid_secondary.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_left_activated.9.png b/res/drawable-mdpi/data_sweep_left_activated.9.png
index fc6764a..940ff0c 100644
--- a/res/drawable-mdpi/data_sweep_left_activated.9.png
+++ b/res/drawable-mdpi/data_sweep_left_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_left_default.9.png b/res/drawable-mdpi/data_sweep_left_default.9.png
index 31343e7..f076a59 100644
--- a/res/drawable-mdpi/data_sweep_left_default.9.png
+++ b/res/drawable-mdpi/data_sweep_left_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_limit_activated.9.png b/res/drawable-mdpi/data_sweep_limit_activated.9.png
index b01d5f0..8db6978 100644
--- a/res/drawable-mdpi/data_sweep_limit_activated.9.png
+++ b/res/drawable-mdpi/data_sweep_limit_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_limit_default.9.png b/res/drawable-mdpi/data_sweep_limit_default.9.png
index a59649a..f40d15c 100644
--- a/res/drawable-mdpi/data_sweep_limit_default.9.png
+++ b/res/drawable-mdpi/data_sweep_limit_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_right_activated.9.png b/res/drawable-mdpi/data_sweep_right_activated.9.png
index 5314538..91da8a0 100644
--- a/res/drawable-mdpi/data_sweep_right_activated.9.png
+++ b/res/drawable-mdpi/data_sweep_right_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_right_default.9.png b/res/drawable-mdpi/data_sweep_right_default.9.png
index cc3b586..55e6536 100644
--- a/res/drawable-mdpi/data_sweep_right_default.9.png
+++ b/res/drawable-mdpi/data_sweep_right_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_warning_activated.9.png b/res/drawable-mdpi/data_sweep_warning_activated.9.png
index ed44d4d..257d790 100644
--- a/res/drawable-mdpi/data_sweep_warning_activated.9.png
+++ b/res/drawable-mdpi/data_sweep_warning_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_warning_default.9.png b/res/drawable-mdpi/data_sweep_warning_default.9.png
index 760ea18..95a8b42 100644
--- a/res/drawable-mdpi/data_sweep_warning_default.9.png
+++ b/res/drawable-mdpi/data_sweep_warning_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png
deleted file mode 100644
index fd2572e..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png
new file mode 100644
index 0000000..5681da6
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png
deleted file mode 100644
index 99441d4..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
new file mode 100644
index 0000000..5dedfad
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png
deleted file mode 100644
index 6e2237a90..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
new file mode 100644
index 0000000..b341811
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
new file mode 100644
index 0000000..5b40244
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_half_holo.png
new file mode 100644
index 0000000..501121a
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_half_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png
deleted file mode 100644
index 6e3ee2e..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png
new file mode 100644
index 0000000..c073ebe
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png
deleted file mode 100644
index b0f741a..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_off.png b/res/drawable-mdpi/ic_appwidget_settings_gps_off.png
deleted file mode 100644
index c0dd050..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_gps_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png
new file mode 100644
index 0000000..6442720
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_on.png b/res/drawable-mdpi/ic_appwidget_settings_gps_on.png
deleted file mode 100644
index b6913df..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
new file mode 100644
index 0000000..1c064ff
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_off.png b/res/drawable-mdpi/ic_appwidget_settings_sync_off.png
deleted file mode 100644
index 58fdf56..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_sync_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png
new file mode 100644
index 0000000..ddef24c
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_on.png b/res/drawable-mdpi/ic_appwidget_settings_sync_on.png
deleted file mode 100644
index 2b062ec..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_sync_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
new file mode 100644
index 0000000..5bffa9a
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png
deleted file mode 100644
index 0736b13..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png
new file mode 100644
index 0000000..fc6670b
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png
deleted file mode 100644
index a76c36c..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
new file mode 100644
index 0000000..e6730c5
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_sync_anim0.png b/res/drawable-mdpi/ic_list_sync_anim0.png
deleted file mode 100644
index 981a72e..0000000
--- a/res/drawable-mdpi/ic_list_sync_anim0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_sync_anim1.png b/res/drawable-mdpi/ic_list_sync_anim1.png
deleted file mode 100644
index 4581ba2..0000000
--- a/res/drawable-mdpi/ic_list_sync_anim1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_sync_anim2.png b/res/drawable-mdpi/ic_list_sync_anim2.png
deleted file mode 100644
index b745916..0000000
--- a/res/drawable-mdpi/ic_list_sync_anim2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_sync_anim3.png b/res/drawable-mdpi/ic_list_sync_anim3.png
deleted file mode 100644
index 43e453d..0000000
--- a/res/drawable-mdpi/ic_list_sync_anim3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_anim_holo.png b/res/drawable-mdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..66db062
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_anim_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_error.png b/res/drawable-mdpi/ic_sync_error.png
new file mode 100644
index 0000000..2b98bca
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_error.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_error_holo.png b/res/drawable-mdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..dd3958e
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_error_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_green_holo.png b/res/drawable-mdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..1c981b66
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_green_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_grey_holo.png b/res/drawable-mdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..bb4267f
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_grey_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_red_holo.png b/res/drawable-mdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..36fe6b8
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_red_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg.9.png b/res/drawable-xhdpi/appwidget_bg.9.png
deleted file mode 100644
index e887b7b..0000000
--- a/res/drawable-xhdpi/appwidget_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg_focused_holo.9.png b/res/drawable-xhdpi/appwidget_bg_focused_holo.9.png
new file mode 100644
index 0000000..d813117
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_bg_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg_holo.9.png b/res/drawable-xhdpi/appwidget_bg_holo.9.png
new file mode 100644
index 0000000..4628822
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_bg_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg_pressed_holo.9.png b/res/drawable-xhdpi/appwidget_bg_pressed_holo.9.png
new file mode 100644
index 0000000..47a3f1fb
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_bg_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focus_c.9.png b/res/drawable-xhdpi/appwidget_inner_focus_c.9.png
deleted file mode 100644
index c24cc06..0000000
--- a/res/drawable-xhdpi/appwidget_inner_focus_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focus_l.9.png b/res/drawable-xhdpi/appwidget_inner_focus_l.9.png
deleted file mode 100644
index 4182270..0000000
--- a/res/drawable-xhdpi/appwidget_inner_focus_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focus_r.9.png b/res/drawable-xhdpi/appwidget_inner_focus_r.9.png
deleted file mode 100644
index d97d021..0000000
--- a/res/drawable-xhdpi/appwidget_inner_focus_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png
new file mode 100644
index 0000000..0de253c
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png
new file mode 100644
index 0000000..6cffc9b
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png
new file mode 100644
index 0000000..8d11bfe
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_press_c.9.png b/res/drawable-xhdpi/appwidget_inner_press_c.9.png
deleted file mode 100644
index 798d79e..0000000
--- a/res/drawable-xhdpi/appwidget_inner_press_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_press_l.9.png b/res/drawable-xhdpi/appwidget_inner_press_l.9.png
deleted file mode 100644
index 7421fab..0000000
--- a/res/drawable-xhdpi/appwidget_inner_press_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_press_r.9.png b/res/drawable-xhdpi/appwidget_inner_press_r.9.png
deleted file mode 100644
index bb2bfc3..0000000
--- a/res/drawable-xhdpi/appwidget_inner_press_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
new file mode 100644
index 0000000..defdbb9
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
new file mode 100644
index 0000000..f3a7cfd
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
new file mode 100644
index 0000000..7eb2457
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_divider.9.png b/res/drawable-xhdpi/appwidget_settings_divider.9.png
deleted file mode 100644
index 47cd9f4..0000000
--- a/res/drawable-xhdpi/appwidget_settings_divider.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png b/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png
new file mode 100644
index 0000000..f7ad910
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_c.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_c.9.png
deleted file mode 100644
index a05852b..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
new file mode 100644
index 0000000..c2a4902
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_l.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_l.9.png
deleted file mode 100644
index 5deea80..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
new file mode 100644
index 0000000..206a731
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_r.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_r.9.png
deleted file mode 100644
index 0db6a5a..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
new file mode 100644
index 0000000..d0768a3
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_c.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_c.9.png
deleted file mode 100644
index afbdfd9..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png
new file mode 100644
index 0000000..590fac1
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_l.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_l.9.png
deleted file mode 100644
index 6db4b0e..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png
new file mode 100644
index 0000000..b9e6721
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_r.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_r.9.png
deleted file mode 100644
index 9af4c76..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png
new file mode 100644
index 0000000..260a1fd
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_c.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_c.9.png
deleted file mode 100644
index 0cca144..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_c.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
new file mode 100644
index 0000000..acc10ec
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_l.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_l.9.png
deleted file mode 100644
index df0ee20..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_l.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
new file mode 100644
index 0000000..897cda4
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_r.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_r.9.png
deleted file mode 100644
index 7d2105a..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_r.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
new file mode 100644
index 0000000..072338a
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_grid_border.9.png b/res/drawable-xhdpi/data_grid_border.9.png
index 2139cf2..66b7e31 100644
--- a/res/drawable-xhdpi/data_grid_border.9.png
+++ b/res/drawable-xhdpi/data_grid_border.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_grid_primary.9.png b/res/drawable-xhdpi/data_grid_primary.9.png
index ae68886..b1a3352 100644
--- a/res/drawable-xhdpi/data_grid_primary.9.png
+++ b/res/drawable-xhdpi/data_grid_primary.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_grid_secondary.9.png b/res/drawable-xhdpi/data_grid_secondary.9.png
index 7a09593..77e30de 100644
--- a/res/drawable-xhdpi/data_grid_secondary.9.png
+++ b/res/drawable-xhdpi/data_grid_secondary.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_left_activated.9.png b/res/drawable-xhdpi/data_sweep_left_activated.9.png
index ff9631e..878bbc8 100644
--- a/res/drawable-xhdpi/data_sweep_left_activated.9.png
+++ b/res/drawable-xhdpi/data_sweep_left_activated.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_left_default.9.png b/res/drawable-xhdpi/data_sweep_left_default.9.png
index 2e0651c..f04e12e 100644
--- a/res/drawable-xhdpi/data_sweep_left_default.9.png
+++ b/res/drawable-xhdpi/data_sweep_left_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_limit_activated.9.png b/res/drawable-xhdpi/data_sweep_limit_activated.9.png
index ae02388..4138ae7 100644
--- a/res/drawable-xhdpi/data_sweep_limit_activated.9.png
+++ b/res/drawable-xhdpi/data_sweep_limit_activated.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_limit_default.9.png b/res/drawable-xhdpi/data_sweep_limit_default.9.png
index 7391148..dcd99f4 100644
--- a/res/drawable-xhdpi/data_sweep_limit_default.9.png
+++ b/res/drawable-xhdpi/data_sweep_limit_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_right_activated.9.png b/res/drawable-xhdpi/data_sweep_right_activated.9.png
index 81c1a3c..9fd92b4 100644
--- a/res/drawable-xhdpi/data_sweep_right_activated.9.png
+++ b/res/drawable-xhdpi/data_sweep_right_activated.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_right_default.9.png b/res/drawable-xhdpi/data_sweep_right_default.9.png
index 94a9f61..ebba774 100644
--- a/res/drawable-xhdpi/data_sweep_right_default.9.png
+++ b/res/drawable-xhdpi/data_sweep_right_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_warning_activated.9.png b/res/drawable-xhdpi/data_sweep_warning_activated.9.png
index 0a2d2b1..83e7d08 100644
--- a/res/drawable-xhdpi/data_sweep_warning_activated.9.png
+++ b/res/drawable-xhdpi/data_sweep_warning_activated.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_warning_default.9.png b/res/drawable-xhdpi/data_sweep_warning_default.9.png
index d5f6044..3a53cf7 100644
--- a/res/drawable-xhdpi/data_sweep_warning_default.9.png
+++ b/res/drawable-xhdpi/data_sweep_warning_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off.png
deleted file mode 100644
index 1040b55..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png
new file mode 100644
index 0000000..9ef00a8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on.png
deleted file mode 100644
index 47b14b8..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
new file mode 100644
index 0000000..de68344
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto.png
deleted file mode 100644
index 6ab4610..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
new file mode 100644
index 0000000..5059b0e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
new file mode 100644
index 0000000..525456a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png
new file mode 100644
index 0000000..9656dec
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_off.png
deleted file mode 100644
index 9734349..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png
new file mode 100644
index 0000000..54d40d6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_on.png
deleted file mode 100644
index 746f307..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_off.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_off.png
deleted file mode 100644
index 5c4b208..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_gps_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png
new file mode 100644
index 0000000..0548274
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_on.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_on.png
deleted file mode 100644
index 2861ea5..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_gps_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
new file mode 100644
index 0000000..bdb71f2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_off.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_off.png
deleted file mode 100644
index 98bfb45..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_sync_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png
new file mode 100644
index 0000000..11925bd
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_on.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_on.png
deleted file mode 100644
index c3d308f..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_sync_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
new file mode 100644
index 0000000..53fa2b4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_off.png
deleted file mode 100644
index c9cb47f..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_wifi_off.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png
new file mode 100644
index 0000000..66eace2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on.png
deleted file mode 100644
index 180d4d7..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_wifi_on.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
new file mode 100644
index 0000000..82d6c37
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_sync_anim0.png b/res/drawable-xhdpi/ic_list_sync_anim0.png
deleted file mode 100644
index 9909f6a..0000000
--- a/res/drawable-xhdpi/ic_list_sync_anim0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_sync_anim1.png b/res/drawable-xhdpi/ic_list_sync_anim1.png
deleted file mode 100644
index f751f2a..0000000
--- a/res/drawable-xhdpi/ic_list_sync_anim1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_sync_anim2.png b/res/drawable-xhdpi/ic_list_sync_anim2.png
deleted file mode 100644
index 374db6a..0000000
--- a/res/drawable-xhdpi/ic_list_sync_anim2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_list_sync_anim3.png b/res/drawable-xhdpi/ic_list_sync_anim3.png
deleted file mode 100644
index ec3fde6..0000000
--- a/res/drawable-xhdpi/ic_list_sync_anim3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_anim_holo.png b/res/drawable-xhdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..d315e95
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_anim_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_error.png b/res/drawable-xhdpi/ic_sync_error.png
new file mode 100644
index 0000000..b9a5357
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_error.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_error_holo.png b/res/drawable-xhdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..85f19bf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_error_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_green_holo.png b/res/drawable-xhdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..95e2d7d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_green_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_grey_holo.png b/res/drawable-xhdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..10cc48a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_grey_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_red_holo.png b/res/drawable-xhdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..c4b9136
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_red_holo.png
Binary files differ
diff --git a/res/drawable/appwidget_button_center.xml b/res/drawable/appwidget_button_center.xml
index 194b357..3af32e5 100644
--- a/res/drawable/appwidget_button_center.xml
+++ b/res/drawable/appwidget_button_center.xml
@@ -17,11 +17,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@drawable/appwidget_inner_press_c" />
+ android:drawable="@drawable/appwidget_inner_pressed_c_holo" />
<item android:state_focused="true" android:state_enabled="true"
android:state_window_focused="true"
- android:drawable="@drawable/appwidget_inner_focus_c" />
+ android:drawable="@drawable/appwidget_inner_focused_c_holo" />
<item
android:drawable="@android:color/transparent" />
diff --git a/res/drawable/appwidget_button_left.xml b/res/drawable/appwidget_button_left.xml
index cbbce86..e13cf99 100644
--- a/res/drawable/appwidget_button_left.xml
+++ b/res/drawable/appwidget_button_left.xml
@@ -17,11 +17,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@drawable/appwidget_inner_press_l" />
+ android:drawable="@drawable/appwidget_inner_pressed_l_holo" />
<item android:state_focused="true" android:state_enabled="true"
android:state_window_focused="true"
- android:drawable="@drawable/appwidget_inner_focus_l" />
+ android:drawable="@drawable/appwidget_inner_focused_l_holo" />
<item
android:drawable="@android:color/transparent" />
diff --git a/res/drawable/appwidget_button_right.xml b/res/drawable/appwidget_button_right.xml
index 9623f54..e29c2fe 100644
--- a/res/drawable/appwidget_button_right.xml
+++ b/res/drawable/appwidget_button_right.xml
@@ -17,11 +17,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@drawable/appwidget_inner_press_r" />
+ android:drawable="@drawable/appwidget_inner_pressed_r_holo" />
<item android:state_focused="true" android:state_enabled="true"
android:state_window_focused="true"
- android:drawable="@drawable/appwidget_inner_focus_r" />
+ android:drawable="@drawable/appwidget_inner_focused_r_holo" />
<item
android:drawable="@android:color/transparent" />
diff --git a/res/drawable/ic_list_sync_anim.xml b/res/drawable/ic_list_sync_anim.xml
index b6965c5..e70c300 100644
--- a/res/drawable/ic_list_sync_anim.xml
+++ b/res/drawable/ic_list_sync_anim.xml
@@ -17,12 +17,8 @@
** limitations under the License.
*/
-->
-<animation-list
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:oneshot="false">
- <item android:drawable="@drawable/ic_list_sync_anim0" android:duration="150" />
- <item android:drawable="@drawable/ic_list_sync_anim1" android:duration="150" />
- <item android:drawable="@drawable/ic_list_sync_anim2" android:duration="150" />
- <item android:drawable="@drawable/ic_list_sync_anim3" android:duration="150" />
-</animation-list>
+<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/ic_sync_anim_holo"
+ android:pivotX="50%"
+ android:pivotY="50%" />
diff --git a/res/layout-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml
index d649354..f5da706 100644
--- a/res/layout-sw600dp/accessibility_tutorial_container.xml
+++ b/res/layout-sw600dp/accessibility_tutorial_container.xml
@@ -57,7 +57,8 @@
<View
style="@style/AccessibilityTutorialDivider" />
- <TextView
+ <view
+ class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView"
android:id="@+id/instructions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/accessibility_tutorial_container.xml b/res/layout/accessibility_tutorial_container.xml
index 4ee72f5..6566cff 100644
--- a/res/layout/accessibility_tutorial_container.xml
+++ b/res/layout/accessibility_tutorial_container.xml
@@ -47,7 +47,8 @@
android:focusable="false"
android:clickable="false" />
- <TextView
+ <view
+ class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView"
android:id="@+id/instructions"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 5a4bc59..d54d750 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -37,7 +37,10 @@
<TextView android:id="@+id/sync_settings_error_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/sync_is_failing" />
+ android:layout_margin="8dip"
+ android:text="@string/sync_is_failing"
+ android:drawablePadding="8dip"
+ android:drawableLeft="@drawable/ic_sync_error_holo" />
<!--
<LinearLayout android:id="@+id/remove_account_area"
diff --git a/res/layout/manage_accounts_screen.xml b/res/layout/manage_accounts_screen.xml
index ce86920..2717805 100644
--- a/res/layout/manage_accounts_screen.xml
+++ b/res/layout/manage_accounts_screen.xml
@@ -34,6 +34,9 @@
<TextView android:id="@+id/sync_settings_error_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/sync_is_failing" />
+ android:layout_margin="8dip"
+ android:text="@string/sync_is_failing"
+ android:drawablePadding="8dip"
+ android:drawableLeft="@drawable/ic_sync_error_holo" />
</LinearLayout>
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 6eaa86e..5057aab 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -23,34 +23,23 @@
android:gravity="center_vertical|right">
<ImageView
- android:id="@+android:id/sync_failed"
- android:src="@drawable/ic_list_syncerror"
+ android:id="@+id/sync_failed"
+ android:src="@drawable/ic_sync_error_holo"
android:layout_width="wrap_content"
- android:layout_marginLeft="6sp"
- android:layout_marginBottom="2sp"
+ android:layout_marginRight="8dip"
android:layout_height="wrap_content" />
- <ImageView
- android:id="@+android:id/sync_active"
+ <com.android.settings.widget.AnimatedImageView
+ android:id="@+id/sync_active"
android:src="@drawable/ic_list_sync_anim"
android:layout_width="wrap_content"
- android:layout_marginLeft="6sp"
- android:layout_marginBottom="2sp"
- android:layout_height="wrap_content" />
-
- <ImageView
- android:id="@+android:id/sync_pending"
- android:src="@drawable/ic_list_sync_anim0"
- android:layout_width="wrap_content"
- android:layout_marginLeft="6sp"
- android:layout_marginBottom="2sp"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:layout_marginRight="8dip" />
<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+android:id/checkbox"
+ android:id="@android:id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="4sp"
android:layout_gravity="center_vertical"
android:focusable="false"
android:clickable="false" />
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 210fcc1..16f52f6 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:background="@drawable/appwidget_bg" >
+ android:background="@drawable/appwidget_bg_holo" >
<LinearLayout
android:id="@+id/btn_wifi"
@@ -50,7 +50,7 @@
<ImageView
android:layout_width="1dip"
android:layout_height="match_parent"
- android:background="@drawable/appwidget_settings_divider"
+ android:background="@drawable/appwidget_settings_divider_holo"
/>
<LinearLayout
@@ -83,7 +83,7 @@
<ImageView
android:layout_width="1dip"
android:layout_height="match_parent"
- android:background="@drawable/appwidget_settings_divider"
+ android:background="@drawable/appwidget_settings_divider_holo"
/>
<LinearLayout
@@ -115,7 +115,7 @@
<ImageView
android:layout_width="1dip"
android:layout_height="match_parent"
- android:background="@drawable/appwidget_settings_divider"
+ android:background="@drawable/appwidget_settings_divider_holo"
/>
<LinearLayout
@@ -147,7 +147,7 @@
<ImageView
android:layout_width="1dip"
android:layout_height="match_parent"
- android:background="@drawable/appwidget_settings_divider"
+ android:background="@drawable/appwidget_settings_divider_holo"
/>
<LinearLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87be0e6..29ba1d3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3398,6 +3398,11 @@
<!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
<string name="pointer_location_summary">Screen overlay showing current touch data</string>
+ <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+ <string name="show_touches">Show touches</string>
+ <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+ <string name="show_touches_summary">Show visual feedback for touches</string>
+
<!-- UI debug setting: show where screen updates happen? [CHAR LIMIT=25] -->
<string name="show_screen_updates">Show screen updates</string>
<!-- UI debug setting: show screen updates summary [CHAR LIMIT=50] -->
@@ -3492,7 +3497,7 @@
<!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
<string name="data_usage_app_settings">View application settings</string>
<!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=32] -->
- <string name="data_usage_app_restrict_background">Restrict background data usage</string>
+ <string name="data_usage_app_restrict_background">Restrict background data</string>
<!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
<string name="data_usage_app_restrict_background_summary">Disable background data on networks that you\'ve chosen to limit (<xliff:g id="networks" example="Mobile, Wi-Fi">%1$s</xliff:g>).</string>
<!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 0f8dfbc..b65c2e5 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -64,6 +64,11 @@
android:summary="@string/pointer_location_summary"/>
<CheckBoxPreference
+ android:key="show_touches"
+ android:title="@string/show_touches"
+ android:summary="@string/show_touches_summary"/>
+
+ <CheckBoxPreference
android:key="show_screen_updates"
android:title="@string/show_screen_updates"
android:summary="@string/show_screen_updates_summary"/>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 81929d0..1e71863 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -45,6 +45,11 @@
android:summary="@string/ndef_push_settings_summary" >
</PreferenceScreen>
+ <CheckBoxPreference
+ android:key="toggle_wifi_p2p"
+ android:title="@string/wifi_p2p_settings_title"
+ android:persistent="false" />
+
<PreferenceScreen
android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"
android:key="wifi_p2p_settings"
diff --git a/src/com/android/settings/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java
index da8350c..5039970 100644
--- a/src/com/android/settings/AccessibilityTutorialActivity.java
+++ b/src/com/android/settings/AccessibilityTutorialActivity.java
@@ -27,6 +27,7 @@
import android.os.Handler;
import android.os.Message;
import android.provider.Settings;
+import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -661,4 +662,13 @@
mFinish.setVisibility(visible ? VISIBLE : GONE);
}
}
+
+ /**
+ * Provides a tutorial-specific class name for fired accessibility events.
+ */
+ public static class TutorialTextView extends TextView {
+ public TutorialTextView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+ }
}
diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java
index f76d5cb..824420d 100644
--- a/src/com/android/settings/AccountPreference.java
+++ b/src/com/android/settings/AccountPreference.java
@@ -112,16 +112,16 @@
int res;
switch (status) {
case SYNC_ENABLED:
- res = R.drawable.ic_sync_green;
+ res = R.drawable.ic_sync_green_holo;
break;
case SYNC_DISABLED:
- res = R.drawable.ic_sync_grey;
+ res = R.drawable.ic_sync_grey_holo;
break;
case SYNC_ERROR:
- res = R.drawable.ic_sync_red;
+ res = R.drawable.ic_sync_red_holo;
break;
default:
- res = R.drawable.ic_sync_red;
+ res = R.drawable.ic_sync_red_holo;
Log.e(TAG, "Unknown sync status: " + status);
}
return res;
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index d93c333..bdbec97 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -59,6 +59,7 @@
private static final String STRICT_MODE_KEY = "strict_mode";
private static final String POINTER_LOCATION_KEY = "pointer_location";
+ private static final String SHOW_TOUCHES_KEY = "show_touches";
private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
@@ -80,6 +81,7 @@
private CheckBoxPreference mStrictMode;
private CheckBoxPreference mPointerLocation;
+ private CheckBoxPreference mShowTouches;
private CheckBoxPreference mShowScreenUpdates;
private CheckBoxPreference mShowCpuUsage;
private ListPreference mWindowAnimationScale;
@@ -112,6 +114,7 @@
mStrictMode = (CheckBoxPreference) findPreference(STRICT_MODE_KEY);
mPointerLocation = (CheckBoxPreference) findPreference(POINTER_LOCATION_KEY);
+ mShowTouches = (CheckBoxPreference) findPreference(SHOW_TOUCHES_KEY);
mShowScreenUpdates = (CheckBoxPreference) findPreference(SHOW_SCREEN_UPDATES_KEY);
mShowCpuUsage = (CheckBoxPreference) findPreference(SHOW_CPU_USAGE_KEY);
mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY);
@@ -155,6 +158,7 @@
updatePasswordSummary();
updateStrictModeVisualOptions();
updatePointerLocationOptions();
+ updateShowTouchesOptions();
updateFlingerOptions();
updateCpuUsageOptions();
updateAnimationScaleOptions();
@@ -229,6 +233,16 @@
Settings.System.POINTER_LOCATION, 0) != 0);
}
+ private void writeShowTouchesOptions() {
+ Settings.System.putInt(getActivity().getContentResolver(),
+ Settings.System.SHOW_TOUCHES, mShowTouches.isChecked() ? 1 : 0);
+ }
+
+ private void updateShowTouchesOptions() {
+ mShowTouches.setChecked(Settings.System.getInt(getActivity().getContentResolver(),
+ Settings.System.SHOW_TOUCHES, 0) != 0);
+ }
+
private void updateFlingerOptions() {
// magic communication with surface flinger.
try {
@@ -406,6 +420,8 @@
writeStrictModeVisualOptions();
} else if (preference == mPointerLocation) {
writePointerLocationOptions();
+ } else if (preference == mShowTouches) {
+ writeShowTouchesOptions();
} else if (preference == mShowScreenUpdates) {
writeFlingerOptions();
} else if (preference == mShowCpuUsage) {
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index f5bee3a..3ecde80 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -56,7 +56,6 @@
private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
- private static final String WIFI_AP_SETTINGS = "wifi_ap_settings";
private static final String ENABLE_BLUETOOTH_TETHERING = "enable_bluetooth_tethering";
private static final String TETHERING_HELP = "tethering_help";
private static final String USB_HELP_MODIFIER = "usb_";
@@ -115,7 +114,7 @@
CheckBoxPreference enableWifiAp =
(CheckBoxPreference) findPreference(ENABLE_WIFI_AP);
- Preference wifiApSettings = findPreference(WIFI_AP_SETTINGS);
+ Preference wifiApSettings = findPreference(WIFI_AP_SSID_AND_SECURITY);
mUsbTether = (CheckBoxPreference) findPreference(USB_TETHER_SETTINGS);
mBluetoothTether = (CheckBoxPreference) findPreference(ENABLE_BLUETOOTH_TETHERING);
mTetherHelp = (PreferenceScreen) findPreference(TETHERING_HELP);
@@ -135,7 +134,10 @@
getPreferenceScreen().removePreference(mUsbTether);
}
- if (!wifiAvailable) {
+ if (wifiAvailable) {
+ mWifiApEnabler = new WifiApEnabler(activity, enableWifiAp);
+ initWifiTethering();
+ } else {
getPreferenceScreen().removePreference(enableWifiAp);
getPreferenceScreen().removePreference(wifiApSettings);
}
@@ -150,10 +152,7 @@
}
}
- mWifiApEnabler = new WifiApEnabler(activity, enableWifiAp);
mView = new WebView(activity);
-
- initWifiTethering();
}
private void initWifiTethering() {
@@ -315,7 +314,9 @@
activity.registerReceiver(mTetherChangeReceiver, filter);
if (intent != null) mTetherChangeReceiver.onReceive(activity, intent);
- mWifiApEnabler.resume();
+ if (mWifiApEnabler != null) {
+ mWifiApEnabler.resume();
+ }
updateState();
}
@@ -325,7 +326,9 @@
super.onStop();
getActivity().unregisterReceiver(mTetherChangeReceiver);
mTetherChangeReceiver = null;
- mWifiApEnabler.pause();
+ if (mWifiApEnabler != null) {
+ mWifiApEnabler.pause();
+ }
}
private void updateState() {
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index e1fc882..14ec06b 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -36,6 +36,7 @@
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.nfc.NfcEnabler;
+import com.android.settings.wifi.p2p.WifiP2pEnabler;
public class WirelessSettings extends SettingsPreferenceFragment {
@@ -43,6 +44,7 @@
private static final String KEY_TOGGLE_NFC = "toggle_nfc";
private static final String KEY_NDEF_PUSH_SETTINGS = "ndef_push_settings";
private static final String KEY_VPN_SETTINGS = "vpn_settings";
+ private static final String KEY_TOGGLE_WIFI_P2P = "toggle_wifi_p2p";
private static final String KEY_WIFI_P2P_SETTINGS = "wifi_p2p_settings";
private static final String KEY_TETHER_SETTINGS = "tether_settings";
private static final String KEY_PROXY_SETTINGS = "proxy_settings";
@@ -58,6 +60,8 @@
private NfcEnabler mNfcEnabler;
private NfcAdapter mNfcAdapter;
+ private WifiP2pEnabler mWifiP2pEnabler;
+
/**
* Invoked on each preference click in this hierarchy, overrides
* PreferenceActivity's implementation. Used to make sure we track the
@@ -98,6 +102,8 @@
CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
PreferenceScreen ndefPush = (PreferenceScreen) findPreference(KEY_NDEF_PUSH_SETTINGS);
+ CheckBoxPreference wifiP2p = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI_P2P);
+
mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
mNfcEnabler = new NfcEnabler(activity, nfc, ndefPush);
@@ -133,6 +139,15 @@
getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS));
}
+ WifiP2pManager p2p = (WifiP2pManager) activity.getSystemService(Context.WIFI_P2P_SERVICE);
+
+ if (!p2p.isP2pSupported()) {
+ getPreferenceScreen().removePreference(wifiP2p);
+ } else {
+ mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p);
+ }
+
+ //Settings is used for debug alone
if (!WIFI_P2P_DEBUG) {
getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
}
@@ -186,6 +201,10 @@
if (mNfcEnabler != null) {
mNfcEnabler.resume();
}
+
+ if (mWifiP2pEnabler != null) {
+ mWifiP2pEnabler.resume();
+ }
}
@Override
@@ -196,6 +215,10 @@
if (mNfcEnabler != null) {
mNfcEnabler.pause();
}
+
+ if (mWifiP2pEnabler != null) {
+ mWifiP2pEnabler.pause();
+ }
}
@Override
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index e70cbad..82f9844 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -158,8 +158,6 @@
mErrorInfoView = (TextView) rootView.findViewById(R.id.sync_settings_error_info);
mErrorInfoView.setVisibility(View.GONE);
- mErrorInfoView.setCompoundDrawablesWithIntrinsicBounds(
- getResources().getDrawable(R.drawable.ic_list_syncerror), null, null, null);
mUserId = (TextView) rootView.findViewById(R.id.user_id);
mProviderId = (TextView) rootView.findViewById(R.id.provider_id);
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 05f74dd..4902d8a 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -110,9 +110,6 @@
mErrorInfoView = (TextView)view.findViewById(R.id.sync_settings_error_info);
mErrorInfoView.setVisibility(View.GONE);
- mErrorInfoView.setCompoundDrawablesWithIntrinsicBounds(
- activity.getResources().getDrawable(R.drawable.ic_list_syncerror),
- null, null, null);
mAutoSyncCheckbox = (CheckBoxPreference) findPreference(AUTO_SYNC_CHECKBOX_KEY);
diff --git a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
index 4b9ca81..13081dd 100644
--- a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
+++ b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
@@ -16,17 +16,15 @@
package com.android.settings.accounts;
-import com.android.settings.R;
-
+import android.accounts.Account;
import android.content.Context;
-import android.graphics.drawable.AnimationDrawable;
-import android.os.Handler;
import android.preference.CheckBoxPreference;
import android.util.AttributeSet;
import android.view.View;
-import android.widget.ImageView;
import android.widget.TextView;
-import android.accounts.Account;
+
+import com.android.settings.R;
+import com.android.settings.widget.AnimatedImageView;
public class SyncStateCheckBoxPreference extends CheckBoxPreference {
@@ -59,35 +57,16 @@
@Override
public void onBindView(View view) {
super.onBindView(view);
- ImageView syncActiveView = (ImageView) view.findViewById(R.id.sync_active);
- View syncPendingView = view.findViewById(R.id.sync_pending);
- View syncFailedView = view.findViewById(R.id.sync_failed);
+ final AnimatedImageView syncActiveView = (AnimatedImageView) view.findViewById(
+ R.id.sync_active);
+ final View syncFailedView = view.findViewById(R.id.sync_failed);
- syncActiveView.setVisibility(mIsActive ? View.VISIBLE : View.GONE);
- final AnimationDrawable anim = (AnimationDrawable) syncActiveView.getDrawable();
- boolean showError;
- boolean showPending;
- if (mIsActive) {
- new Handler(getContext().getMainLooper()).post(new Runnable() {
- public void run() {
- anim.start();
- }
- });
- showPending = false;
- showError = false;
- } else {
- anim.stop();
- if (mIsPending) {
- showPending = true;
- showError = false;
- } else {
- showPending = false;
- showError = mFailed;
- }
- }
+ final boolean activeVisible = mIsActive || mIsPending;
+ syncActiveView.setVisibility(activeVisible ? View.VISIBLE : View.GONE);
+ syncActiveView.setAnimating(mIsActive);
- syncFailedView.setVisibility(showError ? View.VISIBLE : View.GONE);
- syncPendingView.setVisibility((showPending && !mIsActive) ? View.VISIBLE : View.GONE);
+ final boolean failedVisible = mFailed && !activeVisible;
+ syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE);
View checkBox = view.findViewById(android.R.id.checkbox);
if (mOneTimeSyncMode) {
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index e0899cb..799b34a 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -153,6 +153,9 @@
private final Collator sCollator = Collator.getInstance();
@Override
public int compare(AppEntry object1, AppEntry object2) {
+ if (object1.info.enabled != object2.info.enabled) {
+ return object1.info.enabled ? -1 : 1;
+ }
return sCollator.compare(object1.label, object2.label);
}
};
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 747b406..c2e68dd 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -628,10 +628,6 @@
.setIndicator(getActivity().getString(R.string.filter_apps_third_party),
getActivity().getResources().getDrawable(R.drawable.ic_tab_download))
.setContent(this));
- tabHost.addTab(tabHost.newTabSpec(TAB_ALL)
- .setIndicator(getActivity().getString(R.string.filter_apps_all),
- getActivity().getResources().getDrawable(R.drawable.ic_tab_all))
- .setContent(this));
if (!Environment.isExternalStorageEmulated()) {
tabHost.addTab(tabHost.newTabSpec(TAB_SDCARD)
.setIndicator(getActivity().getString(R.string.filter_apps_onsdcard),
@@ -642,6 +638,10 @@
.setIndicator(getActivity().getString(R.string.filter_apps_running),
getActivity().getResources().getDrawable(R.drawable.ic_tab_running))
.setContent(this));
+ tabHost.addTab(tabHost.newTabSpec(TAB_ALL)
+ .setIndicator(getActivity().getString(R.string.filter_apps_all),
+ getActivity().getResources().getDrawable(R.drawable.ic_tab_all))
+ .setContent(this));
tabHost.setCurrentTabByTag(mDefaultTab);
tabHost.setOnTabChangedListener(this);
diff --git a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
index f983f59..952146d 100644
--- a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
+++ b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
@@ -52,7 +52,7 @@
new OnClickListener() {
@Override
public void onClick(View arg0) {
- onCheckBoxClicked(arg0);
+ onCheckBoxClicked();
}
});
mSetingsButton = (ImageView)view.findViewById(R.id.inputmethod_settings);
@@ -80,7 +80,7 @@
mSettingsIntent = intent;
}
- protected void onCheckBoxClicked(View view) {
+ protected void onCheckBoxClicked() {
if (isChecked()) {
setChecked(false);
} else {
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index c80267b..45621e5 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -110,6 +110,7 @@
// IME
mIsOnlyImeSettings = Settings.ACTION_INPUT_METHOD_SETTINGS.equals(
getActivity().getIntent().getAction());
+ getActivity().getIntent().setAction(null);
mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
mImis = mImm.getInputMethodList();
createImePreferenceHierarchy((PreferenceGroup)findPreference("keyboard_settings_category"));
diff --git a/src/com/android/settings/inputmethod/SpellCheckersPreference.java b/src/com/android/settings/inputmethod/SpellCheckersPreference.java
index 7d2eec8..5e4ebba 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersPreference.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersPreference.java
@@ -18,10 +18,22 @@
import android.content.Context;
import android.util.AttributeSet;
+import android.view.textservice.TextServicesManager;
public class SpellCheckersPreference extends CheckBoxAndSettingsPreference {
+ private final TextServicesManager mTsm;
public SpellCheckersPreference(Context context, AttributeSet attrs) {
super(context, attrs);
+ mTsm = (TextServicesManager) context.getSystemService(
+ Context.TEXT_SERVICES_MANAGER_SERVICE);
+ setChecked(mTsm.isSpellCheckerEnabled());
+ }
+
+ @Override
+ protected void onCheckBoxClicked() {
+ super.onCheckBoxClicked();
+ final boolean checked = isChecked();
+ mTsm.setSpellCheckerEnabled(checked);
}
}
diff --git a/src/com/android/settings/widget/AnimatedImageView.java b/src/com/android/settings/widget/AnimatedImageView.java
new file mode 100644
index 0000000..671d718
--- /dev/null
+++ b/src/com/android/settings/widget/AnimatedImageView.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.graphics.drawable.AnimatedRotateDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+public class AnimatedImageView extends ImageView {
+ private AnimatedRotateDrawable mDrawable;
+ private boolean mAnimating;
+
+ public AnimatedImageView(Context context) {
+ super(context);
+ }
+
+ public AnimatedImageView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ private void updateDrawable() {
+ if (isShown() && mDrawable != null) {
+ mDrawable.stop();
+ }
+ final Drawable drawable = getDrawable();
+ if (drawable instanceof AnimatedRotateDrawable) {
+ mDrawable = (AnimatedRotateDrawable) drawable;
+ // TODO: define in drawable xml once we have public attrs.
+ mDrawable.setFramesCount(56);
+ mDrawable.setFramesDuration(32);
+ if (isShown() && mAnimating) {
+ mDrawable.start();
+ }
+ } else {
+ mDrawable = null;
+ }
+ }
+
+ private void updateAnimating() {
+ if (mDrawable != null) {
+ if (isShown() && mAnimating) {
+ mDrawable.start();
+ } else {
+ mDrawable.stop();
+ }
+ }
+ }
+
+ @Override
+ public void setImageDrawable(Drawable drawable) {
+ super.setImageDrawable(drawable);
+ updateDrawable();
+ }
+
+ @Override
+ public void setImageResource(int resid) {
+ super.setImageResource(resid);
+ updateDrawable();
+ }
+
+ @Override
+ public void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ updateAnimating();
+ }
+
+ @Override
+ public void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ updateAnimating();
+ }
+
+ public void setAnimating(boolean animating) {
+ mAnimating = animating;
+ updateAnimating();
+ }
+
+ @Override
+ protected void onVisibilityChanged(View changedView, int vis) {
+ super.onVisibilityChanged(changedView, vis);
+ updateAnimating();
+ }
+}
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 8df009c..656bf47 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -77,21 +77,21 @@
private static final int POS_RIGHT = 2;
private static final int[] IND_DRAWABLE_OFF = {
- R.drawable.appwidget_settings_ind_off_l,
- R.drawable.appwidget_settings_ind_off_c,
- R.drawable.appwidget_settings_ind_off_r
+ R.drawable.appwidget_settings_ind_off_l_holo,
+ R.drawable.appwidget_settings_ind_off_c_holo,
+ R.drawable.appwidget_settings_ind_off_r_holo
};
private static final int[] IND_DRAWABLE_MID = {
- R.drawable.appwidget_settings_ind_mid_l,
- R.drawable.appwidget_settings_ind_mid_c,
- R.drawable.appwidget_settings_ind_mid_r
+ R.drawable.appwidget_settings_ind_mid_l_holo,
+ R.drawable.appwidget_settings_ind_mid_c_holo,
+ R.drawable.appwidget_settings_ind_mid_r_holo
};
private static final int[] IND_DRAWABLE_ON = {
- R.drawable.appwidget_settings_ind_on_l,
- R.drawable.appwidget_settings_ind_on_c,
- R.drawable.appwidget_settings_ind_on_r
+ R.drawable.appwidget_settings_ind_on_l_holo,
+ R.drawable.appwidget_settings_ind_on_c_holo,
+ R.drawable.appwidget_settings_ind_on_r_holo
};
/**
@@ -326,8 +326,8 @@
public int getButtonId() { return R.id.img_wifi; }
public int getIndicatorId() { return R.id.ind_wifi; }
public int getButtonImageId(boolean on) {
- return on ? R.drawable.ic_appwidget_settings_wifi_on
- : R.drawable.ic_appwidget_settings_wifi_off;
+ return on ? R.drawable.ic_appwidget_settings_wifi_on_holo
+ : R.drawable.ic_appwidget_settings_wifi_off_holo;
}
@Override
@@ -409,8 +409,8 @@
public int getButtonId() { return R.id.img_bluetooth; }
public int getIndicatorId() { return R.id.ind_bluetooth; }
public int getButtonImageId(boolean on) {
- return on ? R.drawable.ic_appwidget_settings_bluetooth_on
- : R.drawable.ic_appwidget_settings_bluetooth_off;
+ return on ? R.drawable.ic_appwidget_settings_bluetooth_on_holo
+ : R.drawable.ic_appwidget_settings_bluetooth_off_holo;
}
@Override
@@ -480,8 +480,8 @@
public int getButtonId() { return R.id.img_gps; }
public int getIndicatorId() { return R.id.ind_gps; }
public int getButtonImageId(boolean on) {
- return on ? R.drawable.ic_appwidget_settings_gps_on
- : R.drawable.ic_appwidget_settings_gps_off;
+ return on ? R.drawable.ic_appwidget_settings_gps_on_holo
+ : R.drawable.ic_appwidget_settings_gps_off_holo;
}
@Override
@@ -530,8 +530,8 @@
public int getButtonId() { return R.id.img_sync; }
public int getIndicatorId() { return R.id.ind_sync; }
public int getButtonImageId(boolean on) {
- return on ? R.drawable.ic_appwidget_settings_sync_on
- : R.drawable.ic_appwidget_settings_sync_off;
+ return on ? R.drawable.ic_appwidget_settings_sync_on_holo
+ : R.drawable.ic_appwidget_settings_sync_off_holo;
}
@Override
@@ -669,19 +669,19 @@
if (getBrightnessMode(context)) {
views.setImageViewResource(R.id.img_brightness,
- R.drawable.ic_appwidget_settings_brightness_auto);
+ R.drawable.ic_appwidget_settings_brightness_auto_holo);
views.setImageViewResource(R.id.ind_brightness,
- R.drawable.appwidget_settings_ind_on_r);
+ R.drawable.appwidget_settings_ind_on_r_holo);
} else if (getBrightness(context)) {
views.setImageViewResource(R.id.img_brightness,
- R.drawable.ic_appwidget_settings_brightness_on);
+ R.drawable.ic_appwidget_settings_brightness_full_holo);
views.setImageViewResource(R.id.ind_brightness,
- R.drawable.appwidget_settings_ind_on_r);
+ R.drawable.appwidget_settings_ind_on_r_holo);
} else {
views.setImageViewResource(R.id.img_brightness,
- R.drawable.ic_appwidget_settings_brightness_off);
+ R.drawable.ic_appwidget_settings_brightness_off_holo);
views.setImageViewResource(R.id.ind_brightness,
- R.drawable.appwidget_settings_ind_off_r);
+ R.drawable.appwidget_settings_ind_off_r_holo);
}
}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java b/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
index 608aa02..b812d97 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pEnabler.java
@@ -25,21 +25,19 @@
import android.net.wifi.p2p.WifiP2pManager;
import android.os.Handler;
import android.os.Message;
+import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.provider.Settings;
import android.util.Log;
-import android.widget.CompoundButton;
-import android.widget.Switch;
/**
* WifiP2pEnabler is a helper to manage the Wifi p2p on/off
*/
-public class WifiP2pEnabler implements CompoundButton.OnCheckedChangeListener {
+public class WifiP2pEnabler implements Preference.OnPreferenceChangeListener {
private static final String TAG = "WifiP2pEnabler";
private final Context mContext;
- private Switch mSwitch;
- private int mWifiP2pState;
+ private final CheckBoxPreference mCheckBox;
private final IntentFilter mIntentFilter;
private final Handler mHandler = new WifiP2pHandler();
private WifiP2pManager mWifiP2pManager;
@@ -57,9 +55,9 @@
}
};
- public WifiP2pEnabler(Context context, Switch switch_) {
+ public WifiP2pEnabler(Context context, CheckBoxPreference checkBox) {
mContext = context;
- mSwitch = switch_;
+ mCheckBox = checkBox;
mWifiP2pManager = (WifiP2pManager) context.getSystemService(Context.WIFI_P2P_SERVICE);
if (mWifiP2pManager != null) {
@@ -68,7 +66,7 @@
//Failure to set up connection
Log.e(TAG, "Failed to set up connection with wifi p2p service");
mWifiP2pManager = null;
- mSwitch.setEnabled(false);
+ mCheckBox.setEnabled(false);
}
} else {
Log.e(TAG, "mWifiP2pManager is null!");
@@ -80,48 +78,39 @@
public void resume() {
if (mWifiP2pManager == null) return;
mContext.registerReceiver(mReceiver, mIntentFilter);
- mSwitch.setOnCheckedChangeListener(this);
+ mCheckBox.setOnPreferenceChangeListener(this);
}
public void pause() {
if (mWifiP2pManager == null) return;
mContext.unregisterReceiver(mReceiver);
- mSwitch.setOnCheckedChangeListener(null);
+ mCheckBox.setOnPreferenceChangeListener(null);
}
- public void setSwitch(Switch switch_) {
- if (mSwitch == switch_) return;
- mSwitch.setOnCheckedChangeListener(null);
- mSwitch = switch_;
- mSwitch.setOnCheckedChangeListener(this);
+ public boolean onPreferenceChange(Preference preference, Object value) {
- mSwitch.setChecked(mWifiP2pState == WifiP2pManager.WIFI_P2P_STATE_ENABLED);
- }
+ if (mWifiP2pManager == null) return false;
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-
- if (mWifiP2pManager == null) return;
-
- if (isChecked) {
+ mCheckBox.setEnabled(false);
+ final boolean enable = (Boolean) value;
+ if (enable) {
mWifiP2pManager.enableP2p(mChannel);
} else {
mWifiP2pManager.disableP2p(mChannel);
}
+ return false;
}
private void handleP2pStateChanged(int state) {
- mSwitch.setEnabled(true);
+ mCheckBox.setEnabled(true);
switch (state) {
case WifiP2pManager.WIFI_P2P_STATE_ENABLED:
- mWifiP2pState = WifiP2pManager.WIFI_P2P_STATE_ENABLED;
- mSwitch.setChecked(true);
+ mCheckBox.setChecked(true);
break;
case WifiP2pManager.WIFI_P2P_STATE_DISABLED:
- mWifiP2pState = WifiP2pManager.WIFI_P2P_STATE_DISABLED;
- mSwitch.setChecked(false);
+ mCheckBox.setChecked(false);
break;
default:
- mWifiP2pState = WifiP2pManager.WIFI_P2P_STATE_DISABLED;
Log.e(TAG,"Unhandled wifi state " + state);
break;
}
@@ -135,10 +124,10 @@
//Failure to set up connection
Log.e(TAG, "Lost connection with wifi p2p service");
mWifiP2pManager = null;
- mSwitch.setEnabled(false);
+ mCheckBox.setEnabled(false);
break;
case WifiP2pManager.ENABLE_P2P_FAILED:
- mSwitch.setEnabled(true);
+ mCheckBox.setEnabled(true);
break;
default:
//Ignore
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 0656689..d832012 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -42,7 +42,6 @@
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import android.widget.Switch;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -66,7 +65,6 @@
private final Handler mHandler = new WifiP2pHandler();
private WifiP2pManager mWifiP2pManager;
private WifiP2pManager.Channel mChannel;
- private WifiP2pEnabler mWifiP2pEnabler;
private WifiP2pDialog mConnectDialog;
private OnClickListener mConnectListener;
private OnClickListener mDisconnectListener;
@@ -121,25 +119,6 @@
Log.e(TAG, "mWifiP2pManager is null !");
}
- Switch actionBarSwitch = new Switch(activity);
-
- if (activity instanceof PreferenceActivity) {
- PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
- if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
- final int padding = activity.getResources().getDimensionPixelSize(
- R.dimen.action_bar_switch_padding);
- actionBarSwitch.setPadding(0, 0, padding, 0);
- activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
- ActionBar.DISPLAY_SHOW_CUSTOM);
- activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
- ActionBar.LayoutParams.WRAP_CONTENT,
- ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.RIGHT));
- }
- }
-
- mWifiP2pEnabler = new WifiP2pEnabler(activity, actionBarSwitch);
-
//connect dialog listener
mConnectListener = new OnClickListener() {
@Override
@@ -171,9 +150,6 @@
public void onResume() {
super.onResume();
getActivity().registerReceiver(mReceiver, mIntentFilter);
- if (mWifiP2pEnabler != null) {
- mWifiP2pEnabler.resume();
- }
if (mWifiP2pManager != null) mWifiP2pManager.discoverPeers(mChannel);
}
@@ -181,9 +157,6 @@
@Override
public void onPause() {
super.onPause();
- if (mWifiP2pEnabler != null) {
- mWifiP2pEnabler.pause();
- }
getActivity().unregisterReceiver(mReceiver);
}
