Merge change I2abbb876 into eclair

* changes:
  New widgets

99 files changed, 214 insertions, 137 deletions

diff --git a/res/drawable-hdpi/appwidget_bg.9.png b/res/drawable-hdpi/appwidget_bg.9.png
index 6861664..3b29eae 100644
--- a/res/drawable-hdpi/appwidget_bg.9.png
+++ b/res/drawable-hdpi/appwidget_bg.9.png
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 ffdc02e..0000000
--- a/res/drawable-hdpi/appwidget_inner_default.9.png
+++ /dev/null
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 0000000..a949bd2
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focus_c.9.png
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 0000000..4aaca6c
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focus_l.9.png
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 0000000..1fc0f90
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_focus_r.9.png
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 0000000..ca6f16c
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_press_c.9.png
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 0000000..642eb3d
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_press_l.9.png
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 0000000..5e1f70a
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_inner_press_r.9.png
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 699173d..0000000
--- a/res/drawable-hdpi/appwidget_inner_pressed.9.png
+++ /dev/null
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 591c778..0000000
--- a/res/drawable-hdpi/appwidget_inner_selected.9.png
+++ /dev/null
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 7952ea1..0000000
--- a/res/drawable-hdpi/appwidget_outer_default.9.png
+++ /dev/null
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 b85aef3..0000000
--- a/res/drawable-hdpi/appwidget_outer_pressed.9.png
+++ /dev/null
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 f2d5e39..0000000
--- a/res/drawable-hdpi/appwidget_outer_selected.9.png
+++ /dev/null
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 0000000..01a03bf
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_divider.9.png
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 0000000..7b053c8
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_c.9.png
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 0000000..97e00f6
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_l.9.png
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 0000000..2922fc3
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_mid_r.9.png
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 0000000..10b0296
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_c.9.png
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 0000000..5f21734
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_l.9.png
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 0000000..c7d5dd7
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_off_r.9.png
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 0000000..8b9872b
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_c.9.png
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 0000000..0c80f61
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_l.9.png
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 0000000..f1f0b3d
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_r.9.png
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 0000000..be96dd9
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off.png
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 0000000..0b7ccc6
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on.png
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 0000000..c258d1c
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_mid.png
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 0000000..1bbde2d
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_off.png
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 0000000..296ccb3
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_on.png
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 0000000..ec6bcde
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_gps_off.png
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 0000000..e52caa4
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_gps_on.png
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 0000000..a0a46a5
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_sync_off.png
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 0000000..1342751
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_sync_on.png
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 0000000..cafb195
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_wifi_off.png
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 0000000..c6ac993
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_wifi_on.png
diff --git a/res/drawable-hdpi/widget_btn_bluetooth.png b/res/drawable-hdpi/widget_btn_bluetooth.png
deleted file mode 100644
index 354ea0d..0000000
--- a/res/drawable-hdpi/widget_btn_bluetooth.png
+++ /dev/null
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 42bef3b..0000000
--- a/res/drawable-hdpi/widget_btn_bluetooth_gray.png
+++ /dev/null
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 bce5cfb..0000000
--- a/res/drawable-hdpi/widget_btn_bluetooth_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/widget_btn_brightness.png b/res/drawable-hdpi/widget_btn_brightness.png
deleted file mode 100644
index 605a051..0000000
--- a/res/drawable-hdpi/widget_btn_brightness.png
+++ /dev/null
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 30c4aca..0000000
--- a/res/drawable-hdpi/widget_btn_brightness_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/widget_btn_gps.png b/res/drawable-hdpi/widget_btn_gps.png
deleted file mode 100644
index 2a7baae..0000000
--- a/res/drawable-hdpi/widget_btn_gps.png
+++ /dev/null
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 ea1c7f3..0000000
--- a/res/drawable-hdpi/widget_btn_gps_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/widget_btn_sync.png b/res/drawable-hdpi/widget_btn_sync.png
deleted file mode 100644
index 76b76e1..0000000
--- a/res/drawable-hdpi/widget_btn_sync.png
+++ /dev/null
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 8a489ad..0000000
--- a/res/drawable-hdpi/widget_btn_sync_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/widget_btn_wifi.png b/res/drawable-hdpi/widget_btn_wifi.png
deleted file mode 100644
index 06d0dbf..0000000
--- a/res/drawable-hdpi/widget_btn_wifi.png
+++ /dev/null
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 d16f903..0000000
--- a/res/drawable-hdpi/widget_btn_wifi_gray.png
+++ /dev/null
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 823d040..0000000
--- a/res/drawable-hdpi/widget_btn_wifi_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/appwidget_bg.9.png b/res/drawable-mdpi/appwidget_bg.9.png
index 8e7e3d7..afe41b6 100644
--- a/res/drawable-mdpi/appwidget_bg.9.png
+++ b/res/drawable-mdpi/appwidget_bg.9.png
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 f7e9db4..0000000
--- a/res/drawable-mdpi/appwidget_inner_default.9.png
+++ /dev/null
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 0000000..1450e65
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focus_c.9.png
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 0000000..6e8f100
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focus_l.9.png
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 0000000..bc8757b
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_focus_r.9.png
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 0000000..bd542ba
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_press_c.9.png
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 0000000..575ecf4
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_press_l.9.png
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 0000000..79eaea3
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_inner_press_r.9.png
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 e2b62b7..0000000
--- a/res/drawable-mdpi/appwidget_inner_pressed.9.png
+++ /dev/null
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 b677391..0000000
--- a/res/drawable-mdpi/appwidget_inner_selected.9.png
+++ /dev/null
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 d84e56a..0000000
--- a/res/drawable-mdpi/appwidget_outer_default.9.png
+++ /dev/null
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 5348fef..0000000
--- a/res/drawable-mdpi/appwidget_outer_pressed.9.png
+++ /dev/null
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 c6d5df7..0000000
--- a/res/drawable-mdpi/appwidget_outer_selected.9.png
+++ /dev/null
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 0000000..73c9a27
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_divider.9.png
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 0000000..fee031d
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_c.9.png
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 0000000..6549420
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_l.9.png
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 0000000..ab12452
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_mid_r.9.png
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 0000000..d9440f3
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_c.9.png
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 0000000..a10a47a
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_l.9.png
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 0000000..ce766d0
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_off_r.9.png
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 0000000..72a8623
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_c.9.png
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 0000000..75f6f74
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_l.9.png
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 0000000..0f8975c
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_r.9.png
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 0000000..fd2572e
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png
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 0000000..99441d4
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png
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 0000000..5ffef7a
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_mid.png
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 0000000..6e3ee2e
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_off.png
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 0000000..b0f741a
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_on.png
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 0000000..c0dd050
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_gps_off.png
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 0000000..b6913df
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_gps_on.png
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 0000000..58fdf56
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_sync_off.png
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 0000000..2b062ec
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_sync_on.png
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 0000000..0736b13
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_wifi_off.png
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 0000000..a76c36c
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_wifi_on.png
diff --git a/res/drawable-mdpi/widget_btn_bluetooth.png b/res/drawable-mdpi/widget_btn_bluetooth.png
deleted file mode 100644
index f32d0b2..0000000
--- a/res/drawable-mdpi/widget_btn_bluetooth.png
+++ /dev/null
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 a633554..0000000
--- a/res/drawable-mdpi/widget_btn_bluetooth_gray.png
+++ /dev/null
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 c0ef641..0000000
--- a/res/drawable-mdpi/widget_btn_bluetooth_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/widget_btn_brightness.png b/res/drawable-mdpi/widget_btn_brightness.png
deleted file mode 100644
index 9a7c7b9..0000000
--- a/res/drawable-mdpi/widget_btn_brightness.png
+++ /dev/null
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 46dc508..0000000
--- a/res/drawable-mdpi/widget_btn_brightness_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/widget_btn_gps.png b/res/drawable-mdpi/widget_btn_gps.png
deleted file mode 100644
index b21e8c8..0000000
--- a/res/drawable-mdpi/widget_btn_gps.png
+++ /dev/null
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 042fefb..0000000
--- a/res/drawable-mdpi/widget_btn_gps_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/widget_btn_sync.png b/res/drawable-mdpi/widget_btn_sync.png
deleted file mode 100644
index 6133233..0000000
--- a/res/drawable-mdpi/widget_btn_sync.png
+++ /dev/null
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 192cad8..0000000
--- a/res/drawable-mdpi/widget_btn_sync_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/widget_btn_wifi.png b/res/drawable-mdpi/widget_btn_wifi.png
deleted file mode 100644
index 2d39681..0000000
--- a/res/drawable-mdpi/widget_btn_wifi.png
+++ /dev/null
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 76f36e8..0000000
--- a/res/drawable-mdpi/widget_btn_wifi_gray.png
+++ /dev/null
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 9b70cf1..0000000
--- a/res/drawable-mdpi/widget_btn_wifi_off.png
+++ /dev/null
diff --git a/res/drawable/appwidget_inner.xml b/res/drawable/appwidget_button_center.xml
index fc7bb6d..194b357 100644
--- a/res/drawable/appwidget_inner.xml
+++ b/res/drawable/appwidget_button_center.xml
@@ -16,18 +16,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_default" />
-
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_inner_pressed" />
+        android:drawable="@drawable/appwidget_inner_press_c" />
 
     <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_default" />
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_c" />
 
     <item
-         android:drawable="@drawable/appwidget_inner_default" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable/appwidget_outer.xml b/res/drawable/appwidget_button_left.xml
index d6f3cb6..cbbce86 100644
--- a/res/drawable/appwidget_outer.xml
+++ b/res/drawable/appwidget_button_left.xml
@@ -16,18 +16,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_default" />
-
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_outer_pressed" />
+        android:drawable="@drawable/appwidget_inner_press_l" />
 
     <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_default" />
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_l" />
 
     <item
-         android:drawable="@drawable/appwidget_outer_default" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable/appwidget_button_right.xml b/res/drawable/appwidget_button_right.xml
new file mode 100644
index 0000000..9623f54
--- /dev/null
+++ b/res/drawable/appwidget_button_right.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"
+        android:drawable="@drawable/appwidget_inner_press_r" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_r" />
+
+    <item
+         android:drawable="@android:color/transparent" />
+</selector>
diff --git a/res/layout-land/widget.xml b/res/layout-land/widget.xml
deleted file mode 100644
index fdafd7d..0000000
--- a/res/layout-land/widget.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/main"
-        android:layout_width="@dimen/appwidget_width"
-        android:layout_height="@dimen/appwidget_height"
-        android:gravity="center"
-        android:background="@drawable/appwidget_bg" >
-
-        <ImageButton
-            android:id="@+id/btn_wifi"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_outer"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_bluetooth"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_gps"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_sync"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-        <ImageButton
-            android:id="@+id/btn_brightness"
-            android:layout_width="79dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
-
-    </LinearLayout>
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index dc40469..1e22dbe 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -14,51 +14,166 @@
      limitations under the License.
 -->
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/main"
-        android:layout_width="@dimen/appwidget_width"
-        android:layout_height="@dimen/appwidget_height"
-        android:gravity="center"
-        android:background="@drawable/appwidget_bg" >
-
-        <ImageButton
-            android:id="@+id/btn_wifi"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_outer"
-            android:layout_gravity="center_horizontal"
-        />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center"
+    android:background="@drawable/appwidget_bg" >
 
-        <ImageButton
-            android:id="@+id/btn_bluetooth"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
-        />
+    <LinearLayout
+        android:id="@+id/btn_wifi"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_left"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_wifi"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
 
-        <ImageButton
-            android:id="@+id/btn_gps"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
+        <ImageView
+            android:id="@+id/ind_wifi"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+        </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_settings_divider"
         />
 
-        <ImageButton
-            android:id="@+id/btn_sync"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
+    <LinearLayout
+        android:id="@+id/btn_bluetooth"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_center"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_bluetooth"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
+
+        <ImageView
+            android:id="@+id/ind_bluetooth"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_settings_divider"
         />
 
-        <ImageButton
-            android:id="@+id/btn_brightness"
-            android:layout_width="57dip"
-            android:layout_height="fill_parent"
-            android:background="@drawable/appwidget_inner"
-            android:layout_gravity="center_horizontal"
+    <LinearLayout
+        android:id="@+id/btn_gps"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_center"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_gps"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
+
+        <ImageView
+            android:id="@+id/ind_gps"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_settings_divider"
+        />    
+
+    <LinearLayout
+        android:id="@+id/btn_sync"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_center"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_sync"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
+
+        <ImageView
+            android:id="@+id/ind_sync"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_settings_divider"
         />
 
+    <LinearLayout
+        android:id="@+id/btn_brightness"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_button_right"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/img_brightness"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:scaleType="center"
+            />
+
+        <ImageView
+            android:id="@+id/ind_brightness"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
     </LinearLayout>
+
+</LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9626837..80a4a37 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -18,7 +18,4 @@
     <dimen name="vpn_connect_margin_right">10sp</dimen>
     <dimen name="vpn_connect_normal_text_size">16sp</dimen>
     <dimen name="vpn_connect_input_box_label_width">90sp</dimen>
-
-    <dimen name="appwidget_width">311dip</dimen>
-    <dimen name="appwidget_height">80dip</dimen>
 </resources>
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 2ac3bfa..3db90cf 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;
         }
     }