Merge "Force storage wipe if not removable and encrypted"
diff --git a/res/drawable-hdpi/appwidget_bg_holo.9.png b/res/drawable-hdpi/appwidget_bg_holo.9.png
index 34af75f..02ee440 100644
--- a/res/drawable-hdpi/appwidget_bg_holo.9.png
+++ b/res/drawable-hdpi/appwidget_bg_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
index bc30a63..ab6e8f3 100644
--- a/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png
+++ 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
index f510079..6c1b3c6 100644
--- a/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_focused_r_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
index e51db4d..e3aa8db 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
+++ 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
index 68fb46b..9e27d2f 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
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
index 9d6fcc3..be5394d 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
index 78996de..06d1674 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
index 59fd474..20c5e10 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
+++ 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_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png
index 2a147ca..ed8f93e 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png
index 3d04abd..613396b 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png
index 32dc212..c1a15ce 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png
+++ 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_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
index dd1b3ff..04dd498 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
index e6c5acf..c3e15d2 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
index 9d96d06..673af62 100644
--- a/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
+++ b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
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
index 544a6dc..a45c3ea 100644
--- a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png
+++ 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_holo.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
index 5a4596b..102a50e 100644
--- a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
+++ 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_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
index 54c8266..9c82636 100644
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
+++ 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
index 0de4d0e..80a0980 100644
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
+++ b/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
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
index 89e823b..5138b70 100644
--- a/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
+++ b/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
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
index e37446c..daddd54 100644
--- a/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
+++ b/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
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
index c3c51e85..e095cf9 100644
--- a/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
+++ b/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg_holo.9.png b/res/drawable-mdpi/appwidget_bg_holo.9.png
index fa082c2..a245d91 100644
--- a/res/drawable-mdpi/appwidget_bg_holo.9.png
+++ b/res/drawable-mdpi/appwidget_bg_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
index 1475b3e..feaa6c7 100644
--- a/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png
+++ 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
index 0005829..8d22c56 100644
--- a/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_focused_r_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
index 0f27d8d..e49e8a9 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
+++ 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
index 255e2d4..a54ecd0 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
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
index 9c5bd25..64aed4f 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
index ee8dcce..2b64ac0 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
index a91f50b..62ac4bb 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
+++ 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_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png
index 2edaa2b..0569da7 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png
index 1452c51..9f6fdf8 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png
index 9844e87..94adf5e 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png
+++ 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_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
index 5a59a10..a02deec 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
index 9a1cb7a..55a6386 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
index 4ac5dab..fa4c4f0 100644
--- a/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
+++ b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
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
index a830c6a..35830634 100644
--- a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png
+++ 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_holo.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
index 07328dd..c01ffb2 100644
--- a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
+++ 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_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
index 81f80df..9cebeb3 100644
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
+++ 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
index b3c94c7..b0bbb26 100644
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
+++ b/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
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
index 4a70da7..9e98ad9 100644
--- a/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
+++ b/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
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
index 6e3c81a..f7ba24a 100644
--- a/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
+++ b/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
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
index 6cb023a..1fa295b 100644
--- a/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
+++ b/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg_holo.9.png b/res/drawable-xhdpi/appwidget_bg_holo.9.png
index a30874b..7ccb762 100644
--- a/res/drawable-xhdpi/appwidget_bg_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_bg_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
index 6cffc9b..ce9decd 100644
--- a/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png
+++ 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
index 8d11bfe..448cd83 100644
--- a/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_focused_r_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
index f3a7cfd..582d0e1 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
+++ 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
index 7eb2457..9732dd7 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
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
index 45f6b8a..b117df6 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
index 083997c..421c4e2 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
index 98b4711..220ac66 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
+++ 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_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png
index 1c7021c..b7e613d 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png
index 1c96527..ba98e58 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png
index 7e9000b..b57478c 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png
+++ 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_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
index dd6ebcf..8a62b72 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
+++ 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_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
index 5ac5819..713d76d 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
+++ 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_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
index 5b748c1..ae0eda2 100644
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
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
index 9b75bb1..bea478e 100644
--- a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png
+++ 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_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
index c830b60..70aca2d 100644
--- a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
+++ 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_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
index b76f1c3..709c25a 100644
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
+++ 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
index 5bd888b..dd13c09 100644
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
+++ b/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
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
index 2a9a290..d1d9768 100644
--- a/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
+++ b/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
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
index 55d4de8..17b5946 100644
--- a/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
+++ b/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
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
index 1dcbef5..bdf9918 100644
--- a/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
+++ b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
Binary files differ
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index c134949..0c9f742 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -58,7 +58,6 @@
<TextView
android:id="@android:id/summary"
android:layout_columnSpan="2"
- android:layout_gravity="fill_horizontal"
android:layout_marginTop="4dip"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 2e0cbdd..a1a7ec4 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -20,10 +20,13 @@
android:id="@+id/chart"
android:layout_width="match_parent"
android:layout_height="@dimen/data_usage_chart_height"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:layout_marginLeft="-16dip"
+ android:layout_marginRight="-16dip"
+ android:layout_marginBottom="-32dip"
+ android:paddingLeft="24dip"
+ android:paddingRight="24dip"
android:paddingTop="16dip"
- android:paddingBottom="16dip"
+ android:paddingBottom="48dip"
settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"
settings:optimalWidthWeight="0.4">
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index b27d88f..9dcb456 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -17,6 +17,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
+ android:paddingRight="@*android:dimen/preference_fragment_padding_side"
android:orientation="vertical"
android:clipChildren="false"
android:clipToPadding="false">
diff --git a/res/layout/data_usage_item.xml b/res/layout/data_usage_item.xml
new file mode 100644
index 0000000..7808173
--- /dev/null
+++ b/res/layout/data_usage_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
+ android:paddingRight="@*android:dimen/preference_fragment_padding_side">
+
+ <include layout="@layout/app_percentage_item" />
+
+</FrameLayout>
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 16f52f6..fa8f3de 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -26,6 +26,7 @@
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="match_parent"
+ android:paddingTop="12dp"
android:background="@drawable/appwidget_button_left"
android:clickable="true"
android:focusable="true"
@@ -58,6 +59,7 @@
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="match_parent"
+ android:paddingTop="12dp"
android:background="@drawable/appwidget_button_center"
android:clickable="true"
android:focusable="true"
@@ -91,6 +93,7 @@
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="match_parent"
+ android:paddingTop="12dp"
android:background="@drawable/appwidget_button_center"
android:clickable="true"
android:focusable="true"
@@ -123,6 +126,7 @@
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="match_parent"
+ android:paddingTop="12dp"
android:background="@drawable/appwidget_button_center"
android:clickable="true"
android:focusable="true"
@@ -155,6 +159,7 @@
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="match_parent"
+ android:paddingTop="12dp"
android:background="@drawable/appwidget_button_right"
android:clickable="true"
android:focusable="true"
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
index 4d117c1..90ab026 100644
--- a/res/mipmap-hdpi/ic_launcher_settings.png
+++ b/res/mipmap-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
index 40bdcf4..6ee212c 100644
--- a/res/mipmap-mdpi/ic_launcher_settings.png
+++ b/res/mipmap-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png
index 50ca0db..cfef912 100644
--- a/res/mipmap-xhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ffdec52..9649ed3 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -28,7 +28,7 @@
<dimen name="description_margin_top">26dip</dimen>
<dimen name="description_margin_sides">40dip</dimen>
- <dimen name="data_usage_chart_height">220dip</dimen>
+ <dimen name="data_usage_chart_height">252dip</dimen>
<dimen name="data_usage_chart_optimalWidth">440dip</dimen>
<dimen name="volume_seekbar_side_margin">8dip</dimen>
diff --git a/res/xml/appwidget_info.xml b/res/xml/appwidget_info.xml
index 7a89cec..dc90d4e 100644
--- a/res/xml/appwidget_info.xml
+++ b/res/xml/appwidget_info.xml
@@ -15,8 +15,8 @@
-->
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
- android:minWidth="288dip"
- android:minHeight="48dip"
+ android:minWidth="260dip"
+ android:minHeight="40dip"
android:previewImage="@drawable/preview"
android:initialLayout="@layout/widget"
>
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 87ce772..417c525 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -64,7 +64,9 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
+import android.graphics.drawable.InsetDrawable;
import android.net.ConnectivityManager;
import android.net.INetworkPolicyManager;
import android.net.INetworkStatsService;
@@ -120,6 +122,8 @@
import android.widget.TextView;
import com.android.internal.telephony.Phone;
+import com.android.settings.drawable.InsetBoundsDrawable;
+import com.android.settings.drawable.DrawableWrapper;
import com.android.settings.net.NetworkPolicyEditor;
import com.android.settings.net.SummaryForAllUidLoader;
import com.android.settings.widget.ChartDataUsageView;
@@ -275,7 +279,12 @@
mListView = (ListView) view.findViewById(android.R.id.list);
// adjust padding around tabwidget as needed
- prepareCustomPreferencesList(container, view, mListView);
+ prepareCustomPreferencesList(container, view, mListView, true);
+
+ // inset selector and divider drawables
+ final int insetSide = view.getResources().getDimensionPixelOffset(
+ com.android.internal.R.dimen.preference_fragment_padding_side);
+ insetListViewDrawables(mListView, insetSide);
mTabHost.setup();
mTabHost.setOnTabChangedListener(mTabListener);
@@ -1391,7 +1400,7 @@
public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
convertView = LayoutInflater.from(parent.getContext()).inflate(
- R.layout.app_percentage_item, parent, false);
+ R.layout.data_usage_item, parent, false);
}
final Context context = parent.getContext();
@@ -1913,6 +1922,24 @@
}
/**
+ * Inset both selector and divider {@link Drawable} on the given
+ * {@link ListView} by the requested dimensions.
+ */
+ private static void insetListViewDrawables(ListView view, int insetSide) {
+ final Drawable selector = view.getSelector();
+ final Drawable divider = view.getDivider();
+
+ // fully unregister these drawables so callbacks can be maintained after
+ // wrapping below.
+ final Drawable stub = new ColorDrawable(Color.TRANSPARENT);
+ view.setSelector(stub);
+ view.setDivider(stub);
+
+ view.setSelector(new InsetBoundsDrawable(selector, insetSide));
+ view.setDivider(new InsetBoundsDrawable(divider, insetSide));
+ }
+
+ /**
* Set {@link android.R.id#title} for a preference view inflated with
* {@link #inflatePreference(LayoutInflater, ViewGroup, View)}.
*/
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 2d2b654..20a34a3 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -377,7 +377,8 @@
* when outside scrollbars are requested. Usually used to display
* {@link ListView} and {@link TabWidget} with correct padding.
*/
- public static void prepareCustomPreferencesList(ViewGroup parent, View child, ListView list) {
+ public static void prepareCustomPreferencesList(
+ ViewGroup parent, View child, ListView list, boolean ignoreSidePadding) {
final boolean movePadding = list.getScrollBarStyle() == View.SCROLLBARS_OUTSIDE_OVERLAY;
if (movePadding && parent instanceof PreferenceFrameLayout) {
((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true;
@@ -387,7 +388,9 @@
com.android.internal.R.dimen.preference_fragment_padding_side);
final int paddingBottom = res.getDimensionPixelSize(
com.android.internal.R.dimen.preference_fragment_padding_bottom);
- list.setPadding(paddingSide, 0, paddingSide, paddingBottom);
+
+ final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingBottom;
+ list.setPadding(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom);
}
}
}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index d4abfa8..4157e8a 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -646,7 +646,7 @@
tabHost.setOnTabChangedListener(this);
// adjust padding around tabwidget as needed
- prepareCustomPreferencesList(container, mTabHost, mListView);
+ prepareCustomPreferencesList(container, mTabHost, mListView, false);
return mTabHost;
}
diff --git a/src/com/android/settings/drawable/DrawableWrapper.java b/src/com/android/settings/drawable/DrawableWrapper.java
new file mode 100644
index 0000000..0ac4f7c
--- /dev/null
+++ b/src/com/android/settings/drawable/DrawableWrapper.java
@@ -0,0 +1,162 @@
+/*
+ * 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.drawable;
+
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import com.android.internal.util.Preconditions;
+
+/**
+ * Base wrapper that delegates all calls to another {@link Drawable}. The
+ * wrapped {@link Drawable} <em>must</em> be fully released from any
+ * {@link View} before wrapping, otherwise internal {@link Drawable.Callback}
+ * may be dropped.
+ */
+public class DrawableWrapper extends Drawable implements Drawable.Callback {
+ private final Drawable mDrawable;
+
+ public DrawableWrapper(Drawable drawable) {
+ mDrawable = Preconditions.checkNotNull(drawable);
+ mDrawable.setCallback(this);
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ mDrawable.draw(canvas);
+ }
+
+ @Override
+ public void setBounds(int left, int top, int right, int bottom) {
+ super.setBounds(left, top, right, bottom);
+ mDrawable.setBounds(left, top, right, bottom);
+ }
+
+ @Override
+ public void setChangingConfigurations(int configs) {
+ mDrawable.setChangingConfigurations(configs);
+ }
+
+ @Override
+ public int getChangingConfigurations() {
+ return mDrawable.getChangingConfigurations();
+ }
+
+ @Override
+ public void setDither(boolean dither) {
+ mDrawable.setDither(dither);
+ }
+
+ @Override
+ public void setFilterBitmap(boolean filter) {
+ mDrawable.setFilterBitmap(filter);
+ }
+
+ @Override
+ public void setAlpha(int alpha) {
+ mDrawable.setAlpha(alpha);
+ }
+
+ @Override
+ public void setColorFilter(ColorFilter cf) {
+ mDrawable.setColorFilter(cf);
+ }
+
+ @Override
+ public boolean isStateful() {
+ return mDrawable.isStateful();
+ }
+
+ @Override
+ public boolean setState(final int[] stateSet) {
+ return mDrawable.setState(stateSet);
+ }
+
+ @Override
+ public int[] getState() {
+ return mDrawable.getState();
+ }
+
+ @Override
+ public void jumpToCurrentState() {
+ mDrawable.jumpToCurrentState();
+ }
+
+ @Override
+ public Drawable getCurrent() {
+ return mDrawable.getCurrent();
+ }
+
+ @Override
+ public boolean setVisible(boolean visible, boolean restart) {
+ return super.setVisible(visible, restart) || mDrawable.setVisible(visible, restart);
+ }
+
+ @Override
+ public int getOpacity() {
+ return mDrawable.getOpacity();
+ }
+
+ @Override
+ public Region getTransparentRegion() {
+ return mDrawable.getTransparentRegion();
+ }
+
+ @Override
+ public int getIntrinsicWidth() {
+ return mDrawable.getIntrinsicWidth();
+ }
+
+ @Override
+ public int getIntrinsicHeight() {
+ return mDrawable.getIntrinsicHeight();
+ }
+
+ @Override
+ public int getMinimumWidth() {
+ return mDrawable.getMinimumWidth();
+ }
+
+ @Override
+ public int getMinimumHeight() {
+ return mDrawable.getMinimumHeight();
+ }
+
+ @Override
+ public boolean getPadding(Rect padding) {
+ return mDrawable.getPadding(padding);
+ }
+
+ /** {@inheritDoc} */
+ public void invalidateDrawable(Drawable who) {
+ invalidateSelf();
+ }
+
+ /** {@inheritDoc} */
+ public void scheduleDrawable(Drawable who, Runnable what, long when) {
+ scheduleSelf(what, when);
+ }
+
+ /** {@inheritDoc} */
+ public void unscheduleDrawable(Drawable who, Runnable what) {
+ unscheduleSelf(what);
+ }
+}
diff --git a/src/com/android/settings/drawable/InsetBoundsDrawable.java b/src/com/android/settings/drawable/InsetBoundsDrawable.java
new file mode 100644
index 0000000..50ef9f3
--- /dev/null
+++ b/src/com/android/settings/drawable/InsetBoundsDrawable.java
@@ -0,0 +1,37 @@
+/*
+ * 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.drawable;
+
+import android.graphics.drawable.Drawable;
+
+/**
+ * Wrapper around another {@link Drawable} that insets requested bounds by a
+ * specific amount.
+ */
+public class InsetBoundsDrawable extends DrawableWrapper {
+ private final int mInsetBoundsSides;
+
+ public InsetBoundsDrawable(Drawable drawable, int insetBoundsSides) {
+ super(drawable);
+ mInsetBoundsSides = insetBoundsSides;
+ }
+
+ @Override
+ public void setBounds(int left, int top, int right, int bottom) {
+ super.setBounds(left + mInsetBoundsSides, top, right - mInsetBoundsSides, bottom);
+ }
+}
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index cad2ed8..cb9c8d7 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -496,32 +496,32 @@
public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
final CharSequence unit;
- float result = value;
- long labelValue = 1;
- if (result <= 100 * MB_IN_BYTES) {
+ final long unitFactor;
+ if (value <= 100 * MB_IN_BYTES) {
unit = res.getText(com.android.internal.R.string.megabyteShort);
- result /= MB_IN_BYTES;
- labelValue = MB_IN_BYTES;
+ unitFactor = MB_IN_BYTES;
} else {
unit = res.getText(com.android.internal.R.string.gigabyteShort);
- result /= GB_IN_BYTES;
- labelValue = GB_IN_BYTES;
+ unitFactor = GB_IN_BYTES;
}
+ final double result = (double) value / unitFactor;
+ final double resultRounded;
final CharSequence size;
if (result < 10) {
size = String.format("%.1f", result);
+ resultRounded = (unitFactor * Math.round(result * 10)) / 10;
} else {
size = String.format("%.0f", result);
+ resultRounded = unitFactor * Math.round(result);
}
- labelValue *= Float.parseFloat(size.toString());
final int[] sizeBounds = findOrCreateSpan(builder, sSpanSize, "^1");
builder.replace(sizeBounds[0], sizeBounds[1], size);
final int[] unitBounds = findOrCreateSpan(builder, sSpanUnit, "^2");
builder.replace(unitBounds[0], unitBounds[1], unit);
- return labelValue;
+ return (long) resultRounded;
}
/** {@inheritDoc} */
diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java
index 33e90c8..7b6d887 100644
--- a/src/com/android/settings/widget/ChartSweepView.java
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -45,11 +45,13 @@
private static final boolean DRAW_OUTLINE = false;
+ // TODO: clean up all the various padding/offset/margins
+
private Drawable mSweep;
private Rect mSweepPadding = new Rect();
/** Offset of content inside this view. */
- private Point mContentOffset = new Point();
+ private Rect mContentOffset = new Rect();
/** Offset of {@link #mSweep} inside this view. */
private Point mSweepOffset = new Point();
@@ -229,6 +231,8 @@
if (mLabelTemplate != null && mAxis != null) {
mLabelValue = mAxis.buildLabel(getResources(), mLabelTemplate, mValue);
invalidate();
+ } else {
+ mLabelValue = mValue;
}
}
@@ -333,9 +337,9 @@
// only start tracking when in sweet spot
final boolean accept;
if (mFollowAxis == VERTICAL) {
- accept = event.getX() > getWidth() - (mSweepPadding.right * 3);
+ accept = event.getX() > getWidth() - (mSweepPadding.right * 8);
} else {
- accept = event.getY() > getHeight() - (mSweepPadding.bottom * 3);
+ accept = event.getY() > getHeight() - (mSweepPadding.bottom * 8);
}
final MotionEvent eventInParent = event.copy();
@@ -392,6 +396,7 @@
}
case MotionEvent.ACTION_UP: {
mTracking = null;
+ mValue = mLabelValue;
dispatchOnSweep(true);
setTranslationX(0);
setTranslationY(0);
@@ -534,23 +539,30 @@
mMargins.bottom = mSweepPadding.bottom;
}
- mContentOffset.x = 0;
- mContentOffset.y = 0;
+ mContentOffset.set(0, 0, 0, 0);
// make touch target area larger
+ final int widthBefore = getMeasuredWidth();
+ final int heightBefore = getMeasuredHeight();
if (mFollowAxis == HORIZONTAL) {
- final int widthBefore = getMeasuredWidth();
final int widthAfter = widthBefore * 3;
- setMeasuredDimension(widthAfter, getMeasuredHeight());
- mContentOffset.offset((widthAfter - widthBefore) / 2, 0);
+ setMeasuredDimension(widthAfter, heightBefore);
+ mContentOffset.left = (widthAfter - widthBefore) / 2;
+
+ final int offset = mSweepPadding.bottom * 2;
+ mContentOffset.bottom -= offset;
+ mMargins.bottom += offset;
} else {
- final int heightBefore = getMeasuredHeight();
final int heightAfter = heightBefore * 3;
- setMeasuredDimension(getMeasuredWidth(), heightAfter);
+ setMeasuredDimension(widthBefore, heightAfter);
mContentOffset.offset(0, (heightAfter - heightBefore) / 2);
+
+ final int offset = mSweepPadding.right * 2;
+ mContentOffset.right -= offset;
+ mMargins.right += offset;
}
- mSweepOffset.offset(mContentOffset.x, mContentOffset.y);
+ mSweepOffset.offset(mContentOffset.left, mContentOffset.top);
mMargins.offset(-mSweepOffset.x, -mSweepOffset.y);
}
@@ -592,7 +604,7 @@
if (isEnabled() && mLabelLayout != null) {
final int count = canvas.save();
{
- canvas.translate(mContentOffset.x, mContentOffset.y + labelOffset);
+ canvas.translate(mContentOffset.left, mContentOffset.top + labelOffset);
mLabelLayout.draw(canvas);
}
canvas.restoreToCount(count);
@@ -602,18 +614,18 @@
}
if (mFollowAxis == VERTICAL) {
- mSweep.setBounds(labelSize, mSweepOffset.y, width,
+ mSweep.setBounds(labelSize, mSweepOffset.y, width + mContentOffset.right,
mSweepOffset.y + mSweep.getIntrinsicHeight());
} else {
- mSweep.setBounds(mSweepOffset.x, labelSize,
- mSweepOffset.x + mSweep.getIntrinsicWidth(), height);
+ mSweep.setBounds(mSweepOffset.x, labelSize, mSweepOffset.x + mSweep.getIntrinsicWidth(),
+ height + mContentOffset.bottom);
}
mSweep.draw(canvas);
}
public static float getLabelTop(ChartSweepView view) {
- return view.getY() + view.mContentOffset.y;
+ return view.getY() + view.mContentOffset.top;
}
public static float getLabelBottom(ChartSweepView view) {
