diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png index 68616640433..3b29eae77be 100644 Binary files a/res/drawable-hdpi/appwidget_bg.9.png and b/res/drawable-hdpi/appwidget_bg.9.png differ diff --git a/res/drawable-hdpi/appwidget_inner_default.9.png b/res/drawable-hdpi/appwidget_inner_default.9.png deleted file mode 100644 index ffdc02efbe2..00000000000 Binary files a/res/drawable-hdpi/appwidget_inner_default.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_inner_focus_c.9.png b/res/drawable-hdpi/appwidget_inner_focus_c.9.png new file mode 100644 index 00000000000..a949bd2c3b6 Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_focus_c.9.png differ diff --git a/res/drawable-hdpi/appwidget_inner_focus_l.9.png b/res/drawable-hdpi/appwidget_inner_focus_l.9.png new file mode 100644 index 00000000000..4aaca6c504c Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_focus_l.9.png differ diff --git a/res/drawable-hdpi/appwidget_inner_focus_r.9.png b/res/drawable-hdpi/appwidget_inner_focus_r.9.png new file mode 100644 index 00000000000..1fc0f900af9 Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_focus_r.9.png differ diff --git a/res/drawable-hdpi/appwidget_inner_press_c.9.png b/res/drawable-hdpi/appwidget_inner_press_c.9.png new file mode 100644 index 00000000000..ca6f16cd1df Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_press_c.9.png differ diff --git a/res/drawable-hdpi/appwidget_inner_press_l.9.png b/res/drawable-hdpi/appwidget_inner_press_l.9.png new file mode 100644 index 00000000000..642eb3d326b Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_press_l.9.png differ diff --git a/res/drawable-hdpi/appwidget_inner_press_r.9.png b/res/drawable-hdpi/appwidget_inner_press_r.9.png new file mode 100644 index 00000000000..5e1f70a39bc Binary files /dev/null and b/res/drawable-hdpi/appwidget_inner_press_r.9.png differ diff --git a/res/drawable-hdpi/appwidget_inner_pressed.9.png b/res/drawable-hdpi/appwidget_inner_pressed.9.png deleted file mode 100644 index 699173dbdc0..00000000000 Binary files a/res/drawable-hdpi/appwidget_inner_pressed.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_inner_selected.9.png b/res/drawable-hdpi/appwidget_inner_selected.9.png deleted file mode 100644 index 591c77874f5..00000000000 Binary files a/res/drawable-hdpi/appwidget_inner_selected.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_outer_default.9.png b/res/drawable-hdpi/appwidget_outer_default.9.png deleted file mode 100644 index 7952ea1a44a..00000000000 Binary files a/res/drawable-hdpi/appwidget_outer_default.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_outer_pressed.9.png b/res/drawable-hdpi/appwidget_outer_pressed.9.png deleted file mode 100644 index b85aef3abfa..00000000000 Binary files a/res/drawable-hdpi/appwidget_outer_pressed.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_outer_selected.9.png b/res/drawable-hdpi/appwidget_outer_selected.9.png deleted file mode 100644 index f2d5e39bab4..00000000000 Binary files a/res/drawable-hdpi/appwidget_outer_selected.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_settings_divider.9.png b/res/drawable-hdpi/appwidget_settings_divider.9.png new file mode 100644 index 00000000000..01a03bf6ae1 Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_divider.9.png 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 new file mode 100644 index 00000000000..7b053c88f6f Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png 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 new file mode 100644 index 00000000000..97e00f67135 Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png 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 new file mode 100644 index 00000000000..2922fc384f4 Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png 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 new file mode 100644 index 00000000000..10b02968cdb Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png 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 new file mode 100644 index 00000000000..5f217349eaa Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png 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 new file mode 100644 index 00000000000..c7d5dd7c9b7 Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png 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 new file mode 100644 index 00000000000..8b9872b5ad2 Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png 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 new file mode 100644 index 00000000000..0c80f61c18f Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png 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 new file mode 100644 index 00000000000..f1f0b3d2356 Binary files /dev/null and b/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png new file mode 100644 index 00000000000..be96dd951fb Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png new file mode 100644 index 00000000000..0b7ccc66065 Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png new file mode 100644 index 00000000000..c258d1c8323 Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png new file mode 100644 index 00000000000..1bbde2d43fc Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png new file mode 100644 index 00000000000..296ccb354cc Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png new file mode 100644 index 00000000000..ec6bcde68d5 Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png new file mode 100644 index 00000000000..e52caa41660 Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_off.png b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png new file mode 100644 index 00000000000..a0a46a58eab Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_on.png b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png new file mode 100644 index 00000000000..1342751a663 Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png new file mode 100644 index 00000000000..cafb195378b Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png differ diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png new file mode 100644 index 00000000000..c6ac993ddff Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png differ diff --git a/res/drawable-hdpi/widget_btn_bluetooth.png b/res/drawable-hdpi/widget_btn_bluetooth.png deleted file mode 100644 index 354ea0da7a4..00000000000 Binary files a/res/drawable-hdpi/widget_btn_bluetooth.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_bluetooth_gray.png b/res/drawable-hdpi/widget_btn_bluetooth_gray.png deleted file mode 100644 index 42bef3bbb00..00000000000 Binary files a/res/drawable-hdpi/widget_btn_bluetooth_gray.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_bluetooth_off.png b/res/drawable-hdpi/widget_btn_bluetooth_off.png deleted file mode 100644 index bce5cfb6bbd..00000000000 Binary files a/res/drawable-hdpi/widget_btn_bluetooth_off.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_brightness.png b/res/drawable-hdpi/widget_btn_brightness.png deleted file mode 100644 index 605a051cf1d..00000000000 Binary files a/res/drawable-hdpi/widget_btn_brightness.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_brightness_off.png b/res/drawable-hdpi/widget_btn_brightness_off.png deleted file mode 100644 index 30c4aca58ce..00000000000 Binary files a/res/drawable-hdpi/widget_btn_brightness_off.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_gps.png b/res/drawable-hdpi/widget_btn_gps.png deleted file mode 100644 index 2a7baae4d29..00000000000 Binary files a/res/drawable-hdpi/widget_btn_gps.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_gps_off.png b/res/drawable-hdpi/widget_btn_gps_off.png deleted file mode 100644 index ea1c7f310f5..00000000000 Binary files a/res/drawable-hdpi/widget_btn_gps_off.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_sync.png b/res/drawable-hdpi/widget_btn_sync.png deleted file mode 100644 index 76b76e1b670..00000000000 Binary files a/res/drawable-hdpi/widget_btn_sync.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_sync_off.png b/res/drawable-hdpi/widget_btn_sync_off.png deleted file mode 100644 index 8a489ad9a6a..00000000000 Binary files a/res/drawable-hdpi/widget_btn_sync_off.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_wifi.png b/res/drawable-hdpi/widget_btn_wifi.png deleted file mode 100644 index 06d0dbf84da..00000000000 Binary files a/res/drawable-hdpi/widget_btn_wifi.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_wifi_gray.png b/res/drawable-hdpi/widget_btn_wifi_gray.png deleted file mode 100644 index d16f90342c4..00000000000 Binary files a/res/drawable-hdpi/widget_btn_wifi_gray.png and /dev/null differ diff --git a/res/drawable-hdpi/widget_btn_wifi_off.png b/res/drawable-hdpi/widget_btn_wifi_off.png deleted file mode 100644 index 823d040d097..00000000000 Binary files a/res/drawable-hdpi/widget_btn_wifi_off.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png index 8e7e3d7fdf8..afe41b671e0 100644 Binary files a/res/drawable-mdpi/appwidget_bg.9.png and b/res/drawable-mdpi/appwidget_bg.9.png differ diff --git a/res/drawable-mdpi/appwidget_inner_default.9.png b/res/drawable-mdpi/appwidget_inner_default.9.png deleted file mode 100644 index f7e9db4d7cc..00000000000 Binary files a/res/drawable-mdpi/appwidget_inner_default.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_inner_focus_c.9.png b/res/drawable-mdpi/appwidget_inner_focus_c.9.png new file mode 100644 index 00000000000..1450e65b11f Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_focus_c.9.png differ diff --git a/res/drawable-mdpi/appwidget_inner_focus_l.9.png b/res/drawable-mdpi/appwidget_inner_focus_l.9.png new file mode 100644 index 00000000000..6e8f100e4c1 Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_focus_l.9.png differ diff --git a/res/drawable-mdpi/appwidget_inner_focus_r.9.png b/res/drawable-mdpi/appwidget_inner_focus_r.9.png new file mode 100644 index 00000000000..bc8757b88c6 Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_focus_r.9.png differ diff --git a/res/drawable-mdpi/appwidget_inner_press_c.9.png b/res/drawable-mdpi/appwidget_inner_press_c.9.png new file mode 100644 index 00000000000..bd542bac6e9 Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_press_c.9.png differ diff --git a/res/drawable-mdpi/appwidget_inner_press_l.9.png b/res/drawable-mdpi/appwidget_inner_press_l.9.png new file mode 100644 index 00000000000..575ecf4e13a Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_press_l.9.png differ diff --git a/res/drawable-mdpi/appwidget_inner_press_r.9.png b/res/drawable-mdpi/appwidget_inner_press_r.9.png new file mode 100644 index 00000000000..79eaea35a68 Binary files /dev/null and b/res/drawable-mdpi/appwidget_inner_press_r.9.png differ diff --git a/res/drawable-mdpi/appwidget_inner_pressed.9.png b/res/drawable-mdpi/appwidget_inner_pressed.9.png deleted file mode 100644 index e2b62b79d0b..00000000000 Binary files a/res/drawable-mdpi/appwidget_inner_pressed.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_inner_selected.9.png b/res/drawable-mdpi/appwidget_inner_selected.9.png deleted file mode 100644 index b6773915f5d..00000000000 Binary files a/res/drawable-mdpi/appwidget_inner_selected.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_outer_default.9.png b/res/drawable-mdpi/appwidget_outer_default.9.png deleted file mode 100644 index d84e56a4070..00000000000 Binary files a/res/drawable-mdpi/appwidget_outer_default.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_outer_pressed.9.png b/res/drawable-mdpi/appwidget_outer_pressed.9.png deleted file mode 100644 index 5348fef5510..00000000000 Binary files a/res/drawable-mdpi/appwidget_outer_pressed.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_outer_selected.9.png b/res/drawable-mdpi/appwidget_outer_selected.9.png deleted file mode 100644 index c6d5df77b2f..00000000000 Binary files a/res/drawable-mdpi/appwidget_outer_selected.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_settings_divider.9.png b/res/drawable-mdpi/appwidget_settings_divider.9.png new file mode 100644 index 00000000000..73c9a27492b Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_divider.9.png 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 new file mode 100644 index 00000000000..fee031d76e7 Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png 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 new file mode 100644 index 00000000000..6549420f138 Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png 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 new file mode 100644 index 00000000000..ab124522ef9 Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png 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 new file mode 100644 index 00000000000..d9440f37209 Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png 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 new file mode 100644 index 00000000000..a10a47abae1 Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png 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 new file mode 100644 index 00000000000..ce766d031c3 Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png 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 new file mode 100644 index 00000000000..72a86231d9b Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png 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 new file mode 100644 index 00000000000..75f6f74c982 Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png 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 new file mode 100644 index 00000000000..0f8975cb286 Binary files /dev/null and b/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png new file mode 100644 index 00000000000..fd2572e212a Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png new file mode 100644 index 00000000000..99441d410a7 Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png new file mode 100644 index 00000000000..5ffef7a37b9 Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png new file mode 100644 index 00000000000..6e3ee2ed4ad Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png new file mode 100644 index 00000000000..b0f741a406a Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_off.png b/res/drawable-mdpi/ic_appwidget_settings_gps_off.png new file mode 100644 index 00000000000..c0dd0502fc9 Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_gps_off.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_on.png b/res/drawable-mdpi/ic_appwidget_settings_gps_on.png new file mode 100644 index 00000000000..b6913dfe730 Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_gps_on.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_off.png b/res/drawable-mdpi/ic_appwidget_settings_sync_off.png new file mode 100644 index 00000000000..58fdf56477f Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_sync_off.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_on.png b/res/drawable-mdpi/ic_appwidget_settings_sync_on.png new file mode 100644 index 00000000000..2b062ec7332 Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_sync_on.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png new file mode 100644 index 00000000000..0736b136b60 Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png differ diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png new file mode 100644 index 00000000000..a76c36c0adf Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png differ diff --git a/res/drawable-mdpi/widget_btn_bluetooth.png b/res/drawable-mdpi/widget_btn_bluetooth.png deleted file mode 100644 index f32d0b266fb..00000000000 Binary files a/res/drawable-mdpi/widget_btn_bluetooth.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_bluetooth_gray.png b/res/drawable-mdpi/widget_btn_bluetooth_gray.png deleted file mode 100644 index a633554d667..00000000000 Binary files a/res/drawable-mdpi/widget_btn_bluetooth_gray.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_bluetooth_off.png b/res/drawable-mdpi/widget_btn_bluetooth_off.png deleted file mode 100644 index c0ef641ed15..00000000000 Binary files a/res/drawable-mdpi/widget_btn_bluetooth_off.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_brightness.png b/res/drawable-mdpi/widget_btn_brightness.png deleted file mode 100644 index 9a7c7b91965..00000000000 Binary files a/res/drawable-mdpi/widget_btn_brightness.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_brightness_off.png b/res/drawable-mdpi/widget_btn_brightness_off.png deleted file mode 100644 index 46dc508ac9e..00000000000 Binary files a/res/drawable-mdpi/widget_btn_brightness_off.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_gps.png b/res/drawable-mdpi/widget_btn_gps.png deleted file mode 100644 index b21e8c8bff1..00000000000 Binary files a/res/drawable-mdpi/widget_btn_gps.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_gps_off.png b/res/drawable-mdpi/widget_btn_gps_off.png deleted file mode 100644 index 042fefb0e65..00000000000 Binary files a/res/drawable-mdpi/widget_btn_gps_off.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_sync.png b/res/drawable-mdpi/widget_btn_sync.png deleted file mode 100644 index 6133233d372..00000000000 Binary files a/res/drawable-mdpi/widget_btn_sync.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_sync_off.png b/res/drawable-mdpi/widget_btn_sync_off.png deleted file mode 100644 index 192cad88d73..00000000000 Binary files a/res/drawable-mdpi/widget_btn_sync_off.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_wifi.png b/res/drawable-mdpi/widget_btn_wifi.png deleted file mode 100644 index 2d396810bd2..00000000000 Binary files a/res/drawable-mdpi/widget_btn_wifi.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_wifi_gray.png b/res/drawable-mdpi/widget_btn_wifi_gray.png deleted file mode 100644 index 76f36e84de8..00000000000 Binary files a/res/drawable-mdpi/widget_btn_wifi_gray.png and /dev/null differ diff --git a/res/drawable-mdpi/widget_btn_wifi_off.png b/res/drawable-mdpi/widget_btn_wifi_off.png deleted file mode 100644 index 9b70cf1e215..00000000000 Binary files a/res/drawable-mdpi/widget_btn_wifi_off.png and /dev/null differ diff --git a/res/drawable/appwidget_inner.xml b/res/drawable/appwidget_button_center.xml similarity index 66% rename from res/drawable/appwidget_inner.xml rename to res/drawable/appwidget_button_center.xml index fc7bb6dc254..194b3574af6 100644 --- a/res/drawable/appwidget_inner.xml +++ b/res/drawable/appwidget_button_center.xml @@ -16,18 +16,13 @@ - - + android:drawable="@drawable/appwidget_inner_press_c" /> - - + android:state_window_focused="true" + android:drawable="@drawable/appwidget_inner_focus_c" /> + android:drawable="@android:color/transparent" /> diff --git a/res/drawable/appwidget_outer.xml b/res/drawable/appwidget_button_left.xml similarity index 66% rename from res/drawable/appwidget_outer.xml rename to res/drawable/appwidget_button_left.xml index d6f3cb6261b..cbbce866b6d 100644 --- a/res/drawable/appwidget_outer.xml +++ b/res/drawable/appwidget_button_left.xml @@ -16,18 +16,13 @@ - - + android:drawable="@drawable/appwidget_inner_press_l" /> - - + android:state_window_focused="true" + android:drawable="@drawable/appwidget_inner_focus_l" /> + android:drawable="@android:color/transparent" /> diff --git a/res/drawable/appwidget_button_right.xml b/res/drawable/appwidget_button_right.xml new file mode 100644 index 00000000000..9623f543786 --- /dev/null +++ b/res/drawable/appwidget_button_right.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + diff --git a/res/layout-land/widget.xml b/res/layout-land/widget.xml deleted file mode 100644 index fdafd7d405e..00000000000 --- a/res/layout-land/widget.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/res/layout/widget.xml b/res/layout/widget.xml index dc404695464..1e22dbe1c1b 100644 --- a/res/layout/widget.xml +++ b/res/layout/widget.xml @@ -14,51 +14,166 @@ limitations under the License. --> - + - + + + + + + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 9626837f0f4..80a4a376d01 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -18,7 +18,4 @@ 10sp 16sp 90sp - - 311dip - 80dip diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java index 2ac3bfae908..3db90cfe236 100644 --- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java +++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java @@ -144,40 +144,51 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { private static void updateButtons(RemoteViews views, Context context) { switch (getWifiState(context)) { case STATE_DISABLED: - views.setImageViewResource(R.id.btn_wifi, R.drawable.widget_btn_wifi_off); + views.setImageViewResource(R.id.img_wifi, R.drawable.ic_appwidget_settings_wifi_off); + views.setImageViewResource(R.id.ind_wifi, R.drawable.appwidget_settings_ind_off_l); break; case STATE_ENABLED: - views.setImageViewResource(R.id.btn_wifi, R.drawable.widget_btn_wifi); + views.setImageViewResource(R.id.img_wifi, R.drawable.ic_appwidget_settings_wifi_on); + views.setImageViewResource(R.id.ind_wifi, R.drawable.appwidget_settings_ind_on_l); break; case STATE_INTERMEDIATE: - views.setImageViewResource(R.id.btn_wifi, R.drawable.widget_btn_wifi_gray); + views.setImageViewResource(R.id.img_wifi, R.drawable.ic_appwidget_settings_wifi_off); + views.setImageViewResource(R.id.ind_wifi, R.drawable.appwidget_settings_ind_mid_l); break; } if (getBrightness(context)) { - views.setImageViewResource(R.id.btn_brightness, R.drawable.widget_btn_brightness); + views.setImageViewResource(R.id.img_brightness, R.drawable.ic_appwidget_settings_brightness_on); + views.setImageViewResource(R.id.ind_brightness, R.drawable.appwidget_settings_ind_on_r); } else { - views.setImageViewResource(R.id.btn_brightness, R.drawable.widget_btn_brightness_off); + views.setImageViewResource(R.id.img_brightness, R.drawable.ic_appwidget_settings_brightness_off); + views.setImageViewResource(R.id.ind_brightness, R.drawable.appwidget_settings_ind_off_r); } if (getSync(context)) { - views.setImageViewResource(R.id.btn_sync, R.drawable.widget_btn_sync); + views.setImageViewResource(R.id.img_sync, R.drawable.ic_appwidget_settings_sync_on); + views.setImageViewResource(R.id.ind_sync, R.drawable.appwidget_settings_ind_on_c); } else { - views.setImageViewResource(R.id.btn_sync, R.drawable.widget_btn_sync_off); + views.setImageViewResource(R.id.img_sync, R.drawable.ic_appwidget_settings_sync_off); + views.setImageViewResource(R.id.ind_sync, R.drawable.appwidget_settings_ind_off_c); } if (getGpsState(context)) { - views.setImageViewResource(R.id.btn_gps, R.drawable.widget_btn_gps); + views.setImageViewResource(R.id.img_gps, R.drawable.ic_appwidget_settings_gps_on); + views.setImageViewResource(R.id.ind_gps, R.drawable.appwidget_settings_ind_on_c); } else { - views.setImageViewResource(R.id.btn_gps, R.drawable.widget_btn_gps_off); + views.setImageViewResource(R.id.img_gps, R.drawable.ic_appwidget_settings_gps_off); + views.setImageViewResource(R.id.ind_gps, R.drawable.appwidget_settings_ind_off_c); } switch (getBluetoothState(context)) { case STATE_DISABLED: - views.setImageViewResource(R.id.btn_bluetooth, R.drawable.widget_btn_bluetooth_off); + views.setImageViewResource(R.id.img_bluetooth, R.drawable.ic_appwidget_settings_bluetooth_off); + views.setImageViewResource(R.id.ind_bluetooth, R.drawable.appwidget_settings_ind_off_c); break; case STATE_ENABLED: - views.setImageViewResource(R.id.btn_bluetooth, R.drawable.widget_btn_bluetooth); + views.setImageViewResource(R.id.img_bluetooth, R.drawable.ic_appwidget_settings_bluetooth_on); + views.setImageViewResource(R.id.ind_bluetooth, R.drawable.appwidget_settings_ind_on_c); break; case STATE_INTERMEDIATE: - views.setImageViewResource(R.id.btn_bluetooth, - R.drawable.widget_btn_bluetooth_gray); + views.setImageViewResource(R.id.img_bluetooth, R.drawable.ic_appwidget_settings_bluetooth_off); + views.setImageViewResource(R.id.ind_bluetooth, R.drawable.appwidget_settings_ind_mid_c); break; } }