diff --git a/res/drawable-hdpi/apps_customize_bg.png b/res/drawable-hdpi/apps_customize_bg.png index 81768d71e3..284746796c 100644 Binary files a/res/drawable-hdpi/apps_customize_bg.png and b/res/drawable-hdpi/apps_customize_bg.png differ diff --git a/res/drawable-hdpi/apps_hotseat_button.png b/res/drawable-hdpi/apps_hotseat_button.png index c459ba8237..15e66dba5b 100644 Binary files a/res/drawable-hdpi/apps_hotseat_button.png and b/res/drawable-hdpi/apps_hotseat_button.png differ diff --git a/res/drawable-hdpi/bg_appwidget_error.9.png b/res/drawable-hdpi/bg_appwidget_error.9.png index 59d9822bc3..4da3195d46 100644 Binary files a/res/drawable-hdpi/bg_appwidget_error.9.png and b/res/drawable-hdpi/bg_appwidget_error.9.png differ diff --git a/res/drawable-hdpi/divider_launcher_holo.9.png b/res/drawable-hdpi/divider_launcher_holo.9.png index 0a1bd2a26b..3b7f0007ed 100644 Binary files a/res/drawable-hdpi/divider_launcher_holo.9.png and b/res/drawable-hdpi/divider_launcher_holo.9.png differ diff --git a/res/drawable-hdpi/focused_bg.9.png b/res/drawable-hdpi/focused_bg.9.png index 1b0d3fa40e..b118be1610 100644 Binary files a/res/drawable-hdpi/focused_bg.9.png and b/res/drawable-hdpi/focused_bg.9.png differ diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png index 5f83592eff..d2d263c003 100644 Binary files a/res/drawable-hdpi/gardening_crosshairs.png and b/res/drawable-hdpi/gardening_crosshairs.png differ diff --git a/res/drawable-hdpi/home_press.9.png b/res/drawable-hdpi/home_press.9.png index 743880b0a6..ef07011f82 100644 Binary files a/res/drawable-hdpi/home_press.9.png and b/res/drawable-hdpi/home_press.9.png differ diff --git a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png index ece2afd5bd..27106964f9 100644 Binary files a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png and b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png differ diff --git a/res/drawable-hdpi/homescreen_green_normal_holo.9.png b/res/drawable-hdpi/homescreen_green_normal_holo.9.png index 7332c3b374..677250cf04 100644 Binary files a/res/drawable-hdpi/homescreen_green_normal_holo.9.png and b/res/drawable-hdpi/homescreen_green_normal_holo.9.png differ diff --git a/res/drawable-hdpi/homescreen_green_strong_holo.9.png b/res/drawable-hdpi/homescreen_green_strong_holo.9.png index 190c6cce53..74f4dad36e 100644 Binary files a/res/drawable-hdpi/homescreen_green_strong_holo.9.png and b/res/drawable-hdpi/homescreen_green_strong_holo.9.png differ diff --git a/res/drawable-hdpi/homescreen_small_blue.9.png b/res/drawable-hdpi/homescreen_small_blue.9.png index ddc458ba26..700fadc17b 100644 Binary files a/res/drawable-hdpi/homescreen_small_blue.9.png and b/res/drawable-hdpi/homescreen_small_blue.9.png differ diff --git a/res/drawable-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-hdpi/homescreen_small_blue_strong.9.png index 8f5a74efc8..6eab8f2659 100644 Binary files a/res/drawable-hdpi/homescreen_small_blue_strong.9.png and b/res/drawable-hdpi/homescreen_small_blue_strong.9.png differ diff --git a/res/drawable-hdpi/homescreen_small_green.9.png b/res/drawable-hdpi/homescreen_small_green.9.png index 00baae948c..6e7090bf45 100644 Binary files a/res/drawable-hdpi/homescreen_small_green.9.png and b/res/drawable-hdpi/homescreen_small_green.9.png differ diff --git a/res/drawable-hdpi/homescreen_small_green_strong.9.png b/res/drawable-hdpi/homescreen_small_green_strong.9.png index 77baa52969..db1027e48d 100644 Binary files a/res/drawable-hdpi/homescreen_small_green_strong.9.png and b/res/drawable-hdpi/homescreen_small_green_strong.9.png differ diff --git a/res/drawable-hdpi/hotseat_track_holo.9.png b/res/drawable-hdpi/hotseat_track_holo.9.png index f49344fe86..2ce4967549 100644 Binary files a/res/drawable-hdpi/hotseat_track_holo.9.png and b/res/drawable-hdpi/hotseat_track_holo.9.png differ diff --git a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png index 3c7930f107..a0bfc0f902 100644 Binary files a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png and b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png differ diff --git a/res/drawable-hdpi/ic_launcher_application.png b/res/drawable-hdpi/ic_launcher_application.png index 8074c4c571..882eb148ae 100644 Binary files a/res/drawable-hdpi/ic_launcher_application.png and b/res/drawable-hdpi/ic_launcher_application.png differ diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png index 3dc8b20756..13513e03c5 100644 Binary files a/res/drawable-hdpi/ic_launcher_appwidget.png and b/res/drawable-hdpi/ic_launcher_appwidget.png differ diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/drawable-hdpi/ic_launcher_home.png index 74f6bd7b6a..8945ada344 100644 Binary files a/res/drawable-hdpi/ic_launcher_home.png and b/res/drawable-hdpi/ic_launcher_home.png differ diff --git a/res/drawable-hdpi/ic_launcher_info_active_holo.png b/res/drawable-hdpi/ic_launcher_info_active_holo.png index 83ca112527..c534e56702 100644 Binary files a/res/drawable-hdpi/ic_launcher_info_active_holo.png and b/res/drawable-hdpi/ic_launcher_info_active_holo.png differ diff --git a/res/drawable-hdpi/ic_launcher_info_normal_holo.png b/res/drawable-hdpi/ic_launcher_info_normal_holo.png index 25fb1ac4ca..c9bcd7f374 100644 Binary files a/res/drawable-hdpi/ic_launcher_info_normal_holo.png and b/res/drawable-hdpi/ic_launcher_info_normal_holo.png differ diff --git a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png index 51f02987a5..82b1b59172 100644 Binary files a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png and b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png differ diff --git a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png index 27a4b5e9db..3fc2e8347b 100644 Binary files a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png and b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png differ diff --git a/res/drawable-hdpi/ic_launcher_wallpaper.png b/res/drawable-hdpi/ic_launcher_wallpaper.png index dcd87097c5..5c8ee24bb2 100644 Binary files a/res/drawable-hdpi/ic_launcher_wallpaper.png and b/res/drawable-hdpi/ic_launcher_wallpaper.png differ diff --git a/res/drawable-hdpi/ic_search_normal_holo.png b/res/drawable-hdpi/ic_search_normal_holo.png index 9935f489d7..d888214ec8 100644 Binary files a/res/drawable-hdpi/ic_search_normal_holo.png and b/res/drawable-hdpi/ic_search_normal_holo.png differ diff --git a/res/drawable-hdpi/ic_voice_search_holo.png b/res/drawable-hdpi/ic_voice_search_holo.png index e0df1a285e..d1ec7e3a86 100644 Binary files a/res/drawable-hdpi/ic_voice_search_holo.png and b/res/drawable-hdpi/ic_voice_search_holo.png differ diff --git a/res/drawable-hdpi/paged_view_indicator.9.png b/res/drawable-hdpi/paged_view_indicator.9.png new file mode 100644 index 0000000000..5b47f44771 Binary files /dev/null and b/res/drawable-hdpi/paged_view_indicator.9.png differ diff --git a/res/drawable-hdpi/portal_ring_inner_holo.png b/res/drawable-hdpi/portal_ring_inner_holo.png index 7f48e73637..49df9eca84 100644 Binary files a/res/drawable-hdpi/portal_ring_inner_holo.png and b/res/drawable-hdpi/portal_ring_inner_holo.png differ diff --git a/res/drawable-hdpi/portal_ring_outer_holo.png b/res/drawable-hdpi/portal_ring_outer_holo.png index 4ad47bffe4..282d0d77b1 100644 Binary files a/res/drawable-hdpi/portal_ring_outer_holo.png and b/res/drawable-hdpi/portal_ring_outer_holo.png differ diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png index 291af02269..3a59f255f8 100644 Binary files a/res/drawable-hdpi/pressed_application_background.9.png and b/res/drawable-hdpi/pressed_application_background.9.png differ diff --git a/res/drawable-hdpi/preview_bg.9.png b/res/drawable-hdpi/preview_bg.9.png index 5647144af8..5fa2ed82c8 100644 Binary files a/res/drawable-hdpi/preview_bg.9.png and b/res/drawable-hdpi/preview_bg.9.png differ diff --git a/res/drawable-hdpi/preview_bg_focus.9.png b/res/drawable-hdpi/preview_bg_focus.9.png index 31200fdcd5..bbf67f7a21 100644 Binary files a/res/drawable-hdpi/preview_bg_focus.9.png and b/res/drawable-hdpi/preview_bg_focus.9.png differ diff --git a/res/drawable-hdpi/preview_bg_press.9.png b/res/drawable-hdpi/preview_bg_press.9.png index 9cb12669ea..6d0b022987 100644 Binary files a/res/drawable-hdpi/preview_bg_press.9.png and b/res/drawable-hdpi/preview_bg_press.9.png differ diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png index 2856da02b9..d761b4a550 100644 Binary files a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png and b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png differ diff --git a/res/drawable-hdpi/wallpaper_picker_preview.png b/res/drawable-hdpi/wallpaper_picker_preview.png index 300ea4a381..b48899acfc 100644 Binary files a/res/drawable-hdpi/wallpaper_picker_preview.png and b/res/drawable-hdpi/wallpaper_picker_preview.png differ diff --git a/res/drawable-hdpi/widget_info_bg.9.png b/res/drawable-hdpi/widget_info_bg.9.png index 217b35cb4f..df4cea9dc1 100644 Binary files a/res/drawable-hdpi/widget_info_bg.9.png and b/res/drawable-hdpi/widget_info_bg.9.png differ diff --git a/res/drawable-hdpi/widget_resize_frame_holo.9.png b/res/drawable-hdpi/widget_resize_frame_holo.9.png index 8da665b7a3..c41fbcaa3d 100644 Binary files a/res/drawable-hdpi/widget_resize_frame_holo.9.png and b/res/drawable-hdpi/widget_resize_frame_holo.9.png differ diff --git a/res/drawable-hdpi/widget_resize_handle_bottom.png b/res/drawable-hdpi/widget_resize_handle_bottom.png index 495476b7c1..e039165fbf 100644 Binary files a/res/drawable-hdpi/widget_resize_handle_bottom.png and b/res/drawable-hdpi/widget_resize_handle_bottom.png differ diff --git a/res/drawable-hdpi/widget_resize_handle_left.png b/res/drawable-hdpi/widget_resize_handle_left.png index c73cf0e2ad..bfc2e302db 100644 Binary files a/res/drawable-hdpi/widget_resize_handle_left.png and b/res/drawable-hdpi/widget_resize_handle_left.png differ diff --git a/res/drawable-hdpi/widget_resize_handle_right.png b/res/drawable-hdpi/widget_resize_handle_right.png index 9532302760..a7245b8d06 100644 Binary files a/res/drawable-hdpi/widget_resize_handle_right.png and b/res/drawable-hdpi/widget_resize_handle_right.png differ diff --git a/res/drawable-hdpi/widget_resize_handle_top.png b/res/drawable-hdpi/widget_resize_handle_top.png index a3d2f7c774..447f59a096 100644 Binary files a/res/drawable-hdpi/widget_resize_handle_top.png and b/res/drawable-hdpi/widget_resize_handle_top.png differ diff --git a/res/drawable-land-hdpi/divider_launcher_holo.9.png b/res/drawable-land-hdpi/divider_launcher_holo.9.png index f07f6c4b92..23a0f976bc 100644 Binary files a/res/drawable-land-hdpi/divider_launcher_holo.9.png and b/res/drawable-land-hdpi/divider_launcher_holo.9.png differ diff --git a/res/drawable-land-mdpi/divider_launcher_holo.9.png b/res/drawable-land-mdpi/divider_launcher_holo.9.png index ae7734045c..7bdf32381c 100644 Binary files a/res/drawable-land-mdpi/divider_launcher_holo.9.png and b/res/drawable-land-mdpi/divider_launcher_holo.9.png differ diff --git a/res/drawable-mdpi/apps_customize_bg.png b/res/drawable-mdpi/apps_customize_bg.png index 81768d71e3..284746796c 100644 Binary files a/res/drawable-mdpi/apps_customize_bg.png and b/res/drawable-mdpi/apps_customize_bg.png differ diff --git a/res/drawable-mdpi/apps_hotseat_button.png b/res/drawable-mdpi/apps_hotseat_button.png index f9006a477c..62f119d673 100644 Binary files a/res/drawable-mdpi/apps_hotseat_button.png and b/res/drawable-mdpi/apps_hotseat_button.png differ diff --git a/res/drawable-mdpi/bg_appwidget_error.9.png b/res/drawable-mdpi/bg_appwidget_error.9.png index f222f940b2..493c0d454c 100644 Binary files a/res/drawable-mdpi/bg_appwidget_error.9.png and b/res/drawable-mdpi/bg_appwidget_error.9.png differ diff --git a/res/drawable-mdpi/divider_launcher_holo.9.png b/res/drawable-mdpi/divider_launcher_holo.9.png index 6d101f4ce2..7bdf32381c 100644 Binary files a/res/drawable-mdpi/divider_launcher_holo.9.png and b/res/drawable-mdpi/divider_launcher_holo.9.png differ diff --git a/res/drawable-mdpi/focused_bg.9.png b/res/drawable-mdpi/focused_bg.9.png index 1b0d3fa40e..b118be1610 100644 Binary files a/res/drawable-mdpi/focused_bg.9.png and b/res/drawable-mdpi/focused_bg.9.png differ diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png index 2845fe49ec..9d9f3c15e2 100644 Binary files a/res/drawable-mdpi/gardening_crosshairs.png and b/res/drawable-mdpi/gardening_crosshairs.png differ diff --git a/res/drawable-mdpi/home_press.9.png b/res/drawable-mdpi/home_press.9.png index ff841c3972..679a1f6269 100644 Binary files a/res/drawable-mdpi/home_press.9.png and b/res/drawable-mdpi/home_press.9.png differ diff --git a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png index fef82bba2b..efdc86136d 100644 Binary files a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png and b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png differ diff --git a/res/drawable-mdpi/homescreen_green_normal_holo.9.png b/res/drawable-mdpi/homescreen_green_normal_holo.9.png index dad34d86cf..414a5c91a0 100644 Binary files a/res/drawable-mdpi/homescreen_green_normal_holo.9.png and b/res/drawable-mdpi/homescreen_green_normal_holo.9.png differ diff --git a/res/drawable-mdpi/homescreen_green_strong_holo.9.png b/res/drawable-mdpi/homescreen_green_strong_holo.9.png index 901bf4cf97..15f334ee53 100644 Binary files a/res/drawable-mdpi/homescreen_green_strong_holo.9.png and b/res/drawable-mdpi/homescreen_green_strong_holo.9.png differ diff --git a/res/drawable-mdpi/homescreen_small_blue.9.png b/res/drawable-mdpi/homescreen_small_blue.9.png index 28bc33b181..fb74449a2d 100644 Binary files a/res/drawable-mdpi/homescreen_small_blue.9.png and b/res/drawable-mdpi/homescreen_small_blue.9.png differ diff --git a/res/drawable-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-mdpi/homescreen_small_blue_strong.9.png index f286de9fe4..79d84a4377 100644 Binary files a/res/drawable-mdpi/homescreen_small_blue_strong.9.png and b/res/drawable-mdpi/homescreen_small_blue_strong.9.png differ diff --git a/res/drawable-mdpi/homescreen_small_green.9.png b/res/drawable-mdpi/homescreen_small_green.9.png index 58698ea8db..a713f90be2 100644 Binary files a/res/drawable-mdpi/homescreen_small_green.9.png and b/res/drawable-mdpi/homescreen_small_green.9.png differ diff --git a/res/drawable-mdpi/homescreen_small_green_strong.9.png b/res/drawable-mdpi/homescreen_small_green_strong.9.png index 9773085792..9884bcd9b9 100644 Binary files a/res/drawable-mdpi/homescreen_small_green_strong.9.png and b/res/drawable-mdpi/homescreen_small_green_strong.9.png differ diff --git a/res/drawable-mdpi/hotseat_track_holo.9.png b/res/drawable-mdpi/hotseat_track_holo.9.png index 3dcab6716b..21f1ed1233 100644 Binary files a/res/drawable-mdpi/hotseat_track_holo.9.png and b/res/drawable-mdpi/hotseat_track_holo.9.png differ diff --git a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png index 04749e6f4c..ffc302047a 100644 Binary files a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png and b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png differ diff --git a/res/drawable-mdpi/ic_launcher_application.png b/res/drawable-mdpi/ic_launcher_application.png index 18ea7a5fe1..d7ff4172c6 100644 Binary files a/res/drawable-mdpi/ic_launcher_application.png and b/res/drawable-mdpi/ic_launcher_application.png differ diff --git a/res/drawable-mdpi/ic_launcher_appwidget.png b/res/drawable-mdpi/ic_launcher_appwidget.png index f369ccdb3f..72dbfdf6b6 100644 Binary files a/res/drawable-mdpi/ic_launcher_appwidget.png and b/res/drawable-mdpi/ic_launcher_appwidget.png differ diff --git a/res/drawable-mdpi/ic_launcher_home.png b/res/drawable-mdpi/ic_launcher_home.png index 893d7c7c35..72bd80a2f6 100644 Binary files a/res/drawable-mdpi/ic_launcher_home.png and b/res/drawable-mdpi/ic_launcher_home.png differ diff --git a/res/drawable-mdpi/ic_launcher_info_active_holo.png b/res/drawable-mdpi/ic_launcher_info_active_holo.png index d05de7427c..f84b4a6ba6 100644 Binary files a/res/drawable-mdpi/ic_launcher_info_active_holo.png and b/res/drawable-mdpi/ic_launcher_info_active_holo.png differ diff --git a/res/drawable-mdpi/ic_launcher_info_normal_holo.png b/res/drawable-mdpi/ic_launcher_info_normal_holo.png index 6a07cc9751..eac578f5ce 100644 Binary files a/res/drawable-mdpi/ic_launcher_info_normal_holo.png and b/res/drawable-mdpi/ic_launcher_info_normal_holo.png differ diff --git a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png index 244fe27dc9..0350e558d9 100644 Binary files a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png and b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png differ diff --git a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png index bd5db08164..799b62f8bc 100644 Binary files a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png and b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png differ diff --git a/res/drawable-mdpi/ic_launcher_wallpaper.png b/res/drawable-mdpi/ic_launcher_wallpaper.png index 7e7c6b88ae..d2803b1ca1 100644 Binary files a/res/drawable-mdpi/ic_launcher_wallpaper.png and b/res/drawable-mdpi/ic_launcher_wallpaper.png differ diff --git a/res/drawable-mdpi/ic_search_normal_holo.png b/res/drawable-mdpi/ic_search_normal_holo.png index 6acf24bc4e..9eb214a9de 100644 Binary files a/res/drawable-mdpi/ic_search_normal_holo.png and b/res/drawable-mdpi/ic_search_normal_holo.png differ diff --git a/res/drawable-mdpi/ic_voice_search_holo.png b/res/drawable-mdpi/ic_voice_search_holo.png index 29533ba3c2..34097b712b 100644 Binary files a/res/drawable-mdpi/ic_voice_search_holo.png and b/res/drawable-mdpi/ic_voice_search_holo.png differ diff --git a/res/drawable-mdpi/paged_view_indicator.9.png b/res/drawable-mdpi/paged_view_indicator.9.png index 9fd357a88a..647b60f376 100644 Binary files a/res/drawable-mdpi/paged_view_indicator.9.png and b/res/drawable-mdpi/paged_view_indicator.9.png differ diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png index 4dbae06261..369e64a450 100644 Binary files a/res/drawable-mdpi/portal_ring_inner_holo.png and b/res/drawable-mdpi/portal_ring_inner_holo.png differ diff --git a/res/drawable-mdpi/portal_ring_outer_holo.png b/res/drawable-mdpi/portal_ring_outer_holo.png index a70acf25d7..842e7bc711 100644 Binary files a/res/drawable-mdpi/portal_ring_outer_holo.png and b/res/drawable-mdpi/portal_ring_outer_holo.png differ diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png index b09f595b78..7d5da3da2d 100644 Binary files a/res/drawable-mdpi/pressed_application_background.9.png and b/res/drawable-mdpi/pressed_application_background.9.png differ diff --git a/res/drawable-mdpi/preview_bg.9.png b/res/drawable-mdpi/preview_bg.9.png index 82c951d921..d96e885434 100644 Binary files a/res/drawable-mdpi/preview_bg.9.png and b/res/drawable-mdpi/preview_bg.9.png differ diff --git a/res/drawable-mdpi/preview_bg_focus.9.png b/res/drawable-mdpi/preview_bg_focus.9.png index f64f6a06f7..19e82a7734 100644 Binary files a/res/drawable-mdpi/preview_bg_focus.9.png and b/res/drawable-mdpi/preview_bg_focus.9.png differ diff --git a/res/drawable-mdpi/preview_bg_press.9.png b/res/drawable-mdpi/preview_bg_press.9.png index 151cab6880..f9380903b6 100644 Binary files a/res/drawable-mdpi/preview_bg_press.9.png and b/res/drawable-mdpi/preview_bg_press.9.png differ diff --git a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png index 20c74a17ba..b5e8767b39 100644 Binary files a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png and b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png differ diff --git a/res/drawable-mdpi/wallpaper_picker_preview.png b/res/drawable-mdpi/wallpaper_picker_preview.png index 300ea4a381..b48899acfc 100644 Binary files a/res/drawable-mdpi/wallpaper_picker_preview.png and b/res/drawable-mdpi/wallpaper_picker_preview.png differ diff --git a/res/drawable-mdpi/widget_info_bg.9.png b/res/drawable-mdpi/widget_info_bg.9.png index 7fd1c20e00..c8c62b58fd 100644 Binary files a/res/drawable-mdpi/widget_info_bg.9.png and b/res/drawable-mdpi/widget_info_bg.9.png differ diff --git a/res/drawable-mdpi/widget_resize_frame_holo.9.png b/res/drawable-mdpi/widget_resize_frame_holo.9.png index 0572f8999d..095919f3c0 100644 Binary files a/res/drawable-mdpi/widget_resize_frame_holo.9.png and b/res/drawable-mdpi/widget_resize_frame_holo.9.png differ diff --git a/res/drawable-mdpi/widget_resize_handle_bottom.png b/res/drawable-mdpi/widget_resize_handle_bottom.png index 6c93973225..873d1befed 100644 Binary files a/res/drawable-mdpi/widget_resize_handle_bottom.png and b/res/drawable-mdpi/widget_resize_handle_bottom.png differ diff --git a/res/drawable-mdpi/widget_resize_handle_left.png b/res/drawable-mdpi/widget_resize_handle_left.png index 71394155bd..99a88ac3dc 100644 Binary files a/res/drawable-mdpi/widget_resize_handle_left.png and b/res/drawable-mdpi/widget_resize_handle_left.png differ diff --git a/res/drawable-mdpi/widget_resize_handle_right.png b/res/drawable-mdpi/widget_resize_handle_right.png index 442224b513..ed0a539f75 100644 Binary files a/res/drawable-mdpi/widget_resize_handle_right.png and b/res/drawable-mdpi/widget_resize_handle_right.png differ diff --git a/res/drawable-mdpi/widget_resize_handle_top.png b/res/drawable-mdpi/widget_resize_handle_top.png index 24358849b1..f4159fe046 100644 Binary files a/res/drawable-mdpi/widget_resize_handle_top.png and b/res/drawable-mdpi/widget_resize_handle_top.png differ diff --git a/res/drawable-xhdpi/apps_customize_bg.png b/res/drawable-xhdpi/apps_customize_bg.png new file mode 100644 index 0000000000..a51cc112b6 Binary files /dev/null and b/res/drawable-xhdpi/apps_customize_bg.png differ diff --git a/res/drawable-xhdpi/apps_hotseat_button.png b/res/drawable-xhdpi/apps_hotseat_button.png new file mode 100644 index 0000000000..932dac7c92 Binary files /dev/null and b/res/drawable-xhdpi/apps_hotseat_button.png differ diff --git a/res/drawable-xhdpi/bg_appwidget_error.9.png b/res/drawable-xhdpi/bg_appwidget_error.9.png new file mode 100644 index 0000000000..b792cc8474 Binary files /dev/null and b/res/drawable-xhdpi/bg_appwidget_error.9.png differ diff --git a/res/drawable-xhdpi/divider_launcher_holo.9.png b/res/drawable-xhdpi/divider_launcher_holo.9.png new file mode 100644 index 0000000000..e226ae71eb Binary files /dev/null and b/res/drawable-xhdpi/divider_launcher_holo.9.png differ diff --git a/res/drawable-xhdpi/focused_bg.9.png b/res/drawable-xhdpi/focused_bg.9.png new file mode 100644 index 0000000000..d445c59eff Binary files /dev/null and b/res/drawable-xhdpi/focused_bg.9.png differ diff --git a/res/drawable-xhdpi/gardening_crosshairs.png b/res/drawable-xhdpi/gardening_crosshairs.png index 18c9fbe37a..3168463f2d 100644 Binary files a/res/drawable-xhdpi/gardening_crosshairs.png and b/res/drawable-xhdpi/gardening_crosshairs.png differ diff --git a/res/drawable-xhdpi/home_press.9.png b/res/drawable-xhdpi/home_press.9.png new file mode 100644 index 0000000000..d9abfd358d Binary files /dev/null and b/res/drawable-xhdpi/home_press.9.png differ diff --git a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png index 966d0c1262..3f8eaf597f 100644 Binary files a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png and b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png differ diff --git a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png b/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png deleted file mode 100644 index 7e037ed03c..0000000000 Binary files a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/homescreen_green_normal_holo.9.png b/res/drawable-xhdpi/homescreen_green_normal_holo.9.png index 219db3bf51..4b122136bf 100644 Binary files a/res/drawable-xhdpi/homescreen_green_normal_holo.9.png and b/res/drawable-xhdpi/homescreen_green_normal_holo.9.png differ diff --git a/res/drawable-xhdpi/homescreen_green_strong_holo.9.png b/res/drawable-xhdpi/homescreen_green_strong_holo.9.png index cc71519aff..4e414411fb 100644 Binary files a/res/drawable-xhdpi/homescreen_green_strong_holo.9.png and b/res/drawable-xhdpi/homescreen_green_strong_holo.9.png differ diff --git a/res/drawable-xhdpi/homescreen_small_blue.9.png b/res/drawable-xhdpi/homescreen_small_blue.9.png new file mode 100644 index 0000000000..e678927ff2 Binary files /dev/null and b/res/drawable-xhdpi/homescreen_small_blue.9.png differ diff --git a/res/drawable-xhdpi/homescreen_small_blue_strong.9.png b/res/drawable-xhdpi/homescreen_small_blue_strong.9.png new file mode 100644 index 0000000000..696d9071a6 Binary files /dev/null and b/res/drawable-xhdpi/homescreen_small_blue_strong.9.png differ diff --git a/res/drawable-xhdpi/homescreen_small_green.9.png b/res/drawable-xhdpi/homescreen_small_green.9.png new file mode 100644 index 0000000000..3c4532a1a2 Binary files /dev/null and b/res/drawable-xhdpi/homescreen_small_green.9.png differ diff --git a/res/drawable-xhdpi/homescreen_small_green_strong.9.png b/res/drawable-xhdpi/homescreen_small_green_strong.9.png new file mode 100644 index 0000000000..c1d4ded44f Binary files /dev/null and b/res/drawable-xhdpi/homescreen_small_green_strong.9.png differ diff --git a/res/drawable-xhdpi/hotseat_track_holo.9.png b/res/drawable-xhdpi/hotseat_track_holo.9.png index a362a98cc5..04004b2ab9 100644 Binary files a/res/drawable-xhdpi/hotseat_track_holo.9.png and b/res/drawable-xhdpi/hotseat_track_holo.9.png differ diff --git a/res/drawable-xhdpi/ic_google_logo_normal_holo.png b/res/drawable-xhdpi/ic_google_logo_normal_holo.png deleted file mode 100644 index 925e0b97fb..0000000000 Binary files a/res/drawable-xhdpi/ic_google_logo_normal_holo.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png new file mode 100644 index 0000000000..21a51ab6ae Binary files /dev/null and b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png differ diff --git a/res/drawable-xhdpi/ic_launcher_application.png b/res/drawable-xhdpi/ic_launcher_application.png new file mode 100644 index 0000000000..83acf89efb Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_application.png differ diff --git a/res/drawable-xhdpi/ic_launcher_appwidget.png b/res/drawable-xhdpi/ic_launcher_appwidget.png new file mode 100644 index 0000000000..997504abed Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_appwidget.png differ diff --git a/res/drawable-xhdpi/ic_launcher_home.png b/res/drawable-xhdpi/ic_launcher_home.png new file mode 100644 index 0000000000..7bef13ca73 Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_home.png differ diff --git a/res/drawable-xhdpi/ic_launcher_info_active_holo.png b/res/drawable-xhdpi/ic_launcher_info_active_holo.png index 356c0745f0..b8cdbc4f8a 100644 Binary files a/res/drawable-xhdpi/ic_launcher_info_active_holo.png and b/res/drawable-xhdpi/ic_launcher_info_active_holo.png differ diff --git a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png index 1f827fa900..f503fb82d7 100644 Binary files a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png and b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png differ diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png index 77cc3e4d9a..c155274bd3 100644 Binary files a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png and b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png differ diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png index ce6aff0fcb..2ec7ad9b4e 100644 Binary files a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png and b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png differ diff --git a/res/drawable-xhdpi/ic_launcher_wallpaper.png b/res/drawable-xhdpi/ic_launcher_wallpaper.png new file mode 100644 index 0000000000..9b0b7b2bce Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_wallpaper.png differ diff --git a/res/drawable-xhdpi/ic_search_normal_holo.png b/res/drawable-xhdpi/ic_search_normal_holo.png index 3700a0ca9e..0f4caad91f 100644 Binary files a/res/drawable-xhdpi/ic_search_normal_holo.png and b/res/drawable-xhdpi/ic_search_normal_holo.png differ diff --git a/res/drawable-xhdpi/ic_voice_search_holo.png b/res/drawable-xhdpi/ic_voice_search_holo.png index bab4e4906d..a4152186d4 100644 Binary files a/res/drawable-xhdpi/ic_voice_search_holo.png and b/res/drawable-xhdpi/ic_voice_search_holo.png differ diff --git a/res/drawable-xhdpi/paged_view_indicator.9.png b/res/drawable-xhdpi/paged_view_indicator.9.png new file mode 100644 index 0000000000..fb8a228203 Binary files /dev/null and b/res/drawable-xhdpi/paged_view_indicator.9.png differ diff --git a/res/drawable-xhdpi/portal_ring_inner_holo.png b/res/drawable-xhdpi/portal_ring_inner_holo.png index fc3d3c0c4d..66beb84229 100644 Binary files a/res/drawable-xhdpi/portal_ring_inner_holo.png and b/res/drawable-xhdpi/portal_ring_inner_holo.png differ diff --git a/res/drawable-xhdpi/portal_ring_outer_holo.png b/res/drawable-xhdpi/portal_ring_outer_holo.png index 43579ec5eb..34423fcf39 100644 Binary files a/res/drawable-xhdpi/portal_ring_outer_holo.png and b/res/drawable-xhdpi/portal_ring_outer_holo.png differ diff --git a/res/drawable-xhdpi/pressed_application_background.9.png b/res/drawable-xhdpi/pressed_application_background.9.png new file mode 100644 index 0000000000..05e240a9e7 Binary files /dev/null and b/res/drawable-xhdpi/pressed_application_background.9.png differ diff --git a/res/drawable-xhdpi/preview_bg.9.png b/res/drawable-xhdpi/preview_bg.9.png new file mode 100644 index 0000000000..11cbcb5a26 Binary files /dev/null and b/res/drawable-xhdpi/preview_bg.9.png differ diff --git a/res/drawable-xhdpi/preview_bg_focus.9.png b/res/drawable-xhdpi/preview_bg_focus.9.png new file mode 100644 index 0000000000..698c465e3f Binary files /dev/null and b/res/drawable-xhdpi/preview_bg_focus.9.png differ diff --git a/res/drawable-xhdpi/preview_bg_press.9.png b/res/drawable-xhdpi/preview_bg_press.9.png new file mode 100644 index 0000000000..78e7510997 Binary files /dev/null and b/res/drawable-xhdpi/preview_bg_press.9.png differ diff --git a/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png b/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png new file mode 100644 index 0000000000..d8124f8b61 Binary files /dev/null and b/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png differ diff --git a/res/drawable-xhdpi/wallpaper_picker_preview.png b/res/drawable-xhdpi/wallpaper_picker_preview.png new file mode 100644 index 0000000000..456045511c Binary files /dev/null and b/res/drawable-xhdpi/wallpaper_picker_preview.png differ diff --git a/res/drawable-xhdpi/widget_info_bg.9.png b/res/drawable-xhdpi/widget_info_bg.9.png new file mode 100644 index 0000000000..19eff05895 Binary files /dev/null and b/res/drawable-xhdpi/widget_info_bg.9.png differ diff --git a/res/drawable-xhdpi/widget_resize_frame_holo.9.png b/res/drawable-xhdpi/widget_resize_frame_holo.9.png index 4988cad195..d099206145 100644 Binary files a/res/drawable-xhdpi/widget_resize_frame_holo.9.png and b/res/drawable-xhdpi/widget_resize_frame_holo.9.png differ diff --git a/res/drawable-xhdpi/widget_resize_handle_bottom.png b/res/drawable-xhdpi/widget_resize_handle_bottom.png index 18b5a26f8a..62882c833b 100644 Binary files a/res/drawable-xhdpi/widget_resize_handle_bottom.png and b/res/drawable-xhdpi/widget_resize_handle_bottom.png differ diff --git a/res/drawable-xhdpi/widget_resize_handle_left.png b/res/drawable-xhdpi/widget_resize_handle_left.png index 40d4e0be8c..6f45c99484 100644 Binary files a/res/drawable-xhdpi/widget_resize_handle_left.png and b/res/drawable-xhdpi/widget_resize_handle_left.png differ diff --git a/res/drawable-xhdpi/widget_resize_handle_right.png b/res/drawable-xhdpi/widget_resize_handle_right.png index 5ca60717bd..28437f1c7c 100644 Binary files a/res/drawable-xhdpi/widget_resize_handle_right.png and b/res/drawable-xhdpi/widget_resize_handle_right.png differ diff --git a/res/drawable-xhdpi/widget_resize_handle_top.png b/res/drawable-xhdpi/widget_resize_handle_top.png index 329559cdd6..0d187ad2d7 100644 Binary files a/res/drawable-xhdpi/widget_resize_handle_top.png and b/res/drawable-xhdpi/widget_resize_handle_top.png differ diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml index 9dbe2344bb..f82d5419ef 100644 --- a/res/layout-land/hotseat.xml +++ b/res/layout-land/hotseat.xml @@ -25,8 +25,8 @@ android:layout_height="match_parent" android:paddingTop="@dimen/workspace_top_padding" android:paddingBottom="@dimen/workspace_bottom_padding" - launcher:cellWidth="@dimen/workspace_cell_width" - launcher:cellHeight="@dimen/workspace_cell_height" + launcher:cellWidth="@dimen/hotseat_cell_width" + launcher:cellHeight="@dimen/hotseat_cell_height" launcher:widthGap="-1dp" launcher:heightGap="-1dp" launcher:maxGap="@dimen/workspace_max_gap" /> diff --git a/res/layout-large/search_bar.xml b/res/layout-large/search_bar.xml index d6482feb50..44ac14cdf4 100644 --- a/res/layout-large/search_bar.xml +++ b/res/layout-large/search_bar.xml @@ -71,7 +71,7 @@ android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:paddingTop="@dimen/all_apps_button_vertical_padding" android:paddingBottom="@dimen/all_apps_button_vertical_padding" - android:background="@drawable/button_bg" + android:background="?android:attr/selectableItemBackground" android:gravity="center" android:textColor="#CCFFFFFF" diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml index a122abbf43..53f3c20937 100644 --- a/res/layout-port/hotseat.xml +++ b/res/layout-port/hotseat.xml @@ -26,9 +26,9 @@ android:paddingTop="@dimen/button_bar_height_padding" android:paddingLeft="@dimen/workspace_left_padding" android:paddingRight="@dimen/workspace_right_padding" - launcher:cellWidth="@dimen/workspace_cell_width" - launcher:cellHeight="@dimen/workspace_cell_height" + launcher:cellWidth="@dimen/hotseat_cell_width" + launcher:cellHeight="@dimen/hotseat_cell_height" launcher:widthGap="-1dp" launcher:heightGap="-1dp" launcher:maxGap="@dimen/workspace_max_gap" /> - \ No newline at end of file + diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index b413c5343c..85465b42e8 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -17,12 +17,16 @@ 12dip - 10dip + 4dip + 106dp + 74dp + 68dp + 74dp - 12dp - 12dp + 0dp + 0dp 0dp @@ -33,6 +37,13 @@ 12dp 12dp + + 68dip + + 8dp + 76dp + 80dp diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 9add35759c..088d3fd116 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -20,8 +20,8 @@ 0dp - 12dp - 12dp + 2dp + 2dp 8dp 4 diff --git a/res/values/colors.xml b/res/values/colors.xml index 71f282c978..1efeb9e49d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -27,13 +27,6 @@ #FCCC - #6595f9 - - #6595f9 - #0997ff - #6595f9 - #0997ff - #CCFFFFFF #A0000000 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cb354b4b34..eab4044e54 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -16,9 +16,11 @@ - 48dp + 40dp 80dp - 80dp + 100dp + 80dp + 64dp -1dp -1dp 16dp @@ -46,11 +48,11 @@ 120px - 80dip + 64dip 8dp - 88dp + 72dp 40dp diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index bd3a4bde54..08f337e0d4 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -93,10 +93,10 @@ public class BubbleTextView extends TextView implements VisibilityChangedBroadca mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); mPaint.setColor(bubbleColor); mBubbleColorAlpha = Color.alpha(bubbleColor) / 255.0f; - mFocusedOutlineColor = res.getColor(R.color.workspace_item_focused_outline_color); - mFocusedGlowColor = res.getColor(R.color.workspace_item_focused_glow_color); - mPressedOutlineColor = res.getColor(R.color.workspace_item_pressed_outline_color); - mPressedGlowColor = res.getColor(R.color.workspace_item_pressed_glow_color); + mFocusedOutlineColor = res.getColor(android.R.color.holo_blue_light); + mFocusedGlowColor = res.getColor(android.R.color.holo_blue_light); + mPressedOutlineColor = res.getColor(android.R.color.holo_blue_light); + mPressedGlowColor = res.getColor(android.R.color.holo_blue_light); setShadowLayer(SHADOW_LARGE_RADIUS, 0.0f, SHADOW_Y_OFFSET, SHADOW_LARGE_COLOUR); } diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java index 7fbde54712..d0d4bad6e9 100644 --- a/src/com/android/launcher2/DragLayer.java +++ b/src/com/android/launcher2/DragLayer.java @@ -375,6 +375,11 @@ public class DragLayer extends FrameLayout { toY -= (dragView.getHeight() - (int) Math.round(scale * d.getIntrinsicHeight())) / 2; // Center in the x coordinate about the target's drawable toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2; + } else if (child instanceof FolderIcon) { + // Account for holographic blur padding on the drag view + toY -= HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS / 2; + // Center in the x coordinate about the target's drawable + toX -= (dragView.getMeasuredWidth() - Math.round(scale * child.getMeasuredWidth())) / 2; } else { toY -= (Math.round(scale * (dragView.getHeight() - child.getMeasuredHeight()))) / 2; toX -= (Math.round(scale * (dragView.getMeasuredWidth() diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 48360feb13..24feb41489 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -432,6 +432,7 @@ public abstract class PagedView extends ViewGroup { int maxChildHeight = 0; final int verticalPadding = mPaddingTop + mPaddingBottom; + final int horizontalPadding = mPaddingLeft + mPaddingRight; // The children are given the same width and height as the workspace @@ -458,7 +459,7 @@ public abstract class PagedView extends ViewGroup { } final int childWidthMeasureSpec = - MeasureSpec.makeMeasureSpec(widthSize, childWidthMode); + MeasureSpec.makeMeasureSpec(widthSize - horizontalPadding, childWidthMode); final int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(heightSize - verticalPadding, childHeightMode); diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 26c00ad8d4..ec85af3995 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1970,7 +1970,7 @@ public class Workspace extends SmoothPagedView * Responsibility for the bitmap is transferred to the caller. */ public Bitmap createDragBitmap(View v, Canvas canvas, int padding) { - final int outlineColor = getResources().getColor(R.color.drag_outline_color); + final int outlineColor = getResources().getColor(android.R.color.holo_blue_light); Bitmap b; if (v instanceof TextView) { @@ -1995,7 +1995,7 @@ public class Workspace extends SmoothPagedView * Responsibility for the bitmap is transferred to the caller. */ private Bitmap createDragOutline(View v, Canvas canvas, int padding) { - final int outlineColor = getResources().getColor(R.color.drag_outline_color); + final int outlineColor = getResources().getColor(android.R.color.holo_blue_light); final Bitmap b = Bitmap.createBitmap( v.getWidth() + padding, v.getHeight() + padding, Bitmap.Config.ARGB_8888); @@ -2011,7 +2011,7 @@ public class Workspace extends SmoothPagedView * Responsibility for the bitmap is transferred to the caller. */ private Bitmap createDragOutline(Bitmap orig, Canvas canvas, int padding, int w, int h) { - final int outlineColor = getResources().getColor(R.color.drag_outline_color); + final int outlineColor = getResources().getColor(android.R.color.holo_blue_light); final Bitmap b = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888); canvas.setBitmap(b); @@ -2041,7 +2041,7 @@ public class Workspace extends SmoothPagedView */ private Bitmap createExternalDragOutline(Canvas canvas, int padding) { Resources r = getResources(); - final int outlineColor = r.getColor(R.color.drag_outline_color); + final int outlineColor = r.getColor(android.R.color.holo_blue_light); final int iconWidth = r.getDimensionPixelSize(R.dimen.workspace_cell_width); final int iconHeight = r.getDimensionPixelSize(R.dimen.workspace_cell_height); final int rectRadius = r.getDimensionPixelSize(R.dimen.external_drop_icon_rect_radius); @@ -2295,17 +2295,7 @@ public class Workspace extends SmoothPagedView } else if (mDragInfo != null) { final View cell = mDragInfo.cell; - boolean continueDrop = true; - if (mLauncher.isHotseatLayout(mDragTargetLayout) && d.dragInfo instanceof ItemInfo) { - ItemInfo info = (ItemInfo) d.dragInfo; - if (info.spanX > 1 || info.spanY > 1) { - continueDrop = false; - Toast.makeText(getContext(), R.string.invalid_hotseat_item, - Toast.LENGTH_SHORT).show(); - } - } - - if (continueDrop && dropTargetLayout != null) { + if (dropTargetLayout != null) { // Move internally boolean hasMovedLayouts = (getParentCellLayoutForView(cell) != dropTargetLayout); boolean hasMovedIntoHotseat = mLauncher.isHotseatLayout(dropTargetLayout); @@ -2809,6 +2799,14 @@ public class Workspace extends SmoothPagedView return res; } + private boolean isDragWidget(DragObject d) { + return (d.dragInfo instanceof LauncherAppWidgetInfo || + d.dragInfo instanceof PendingAddWidgetInfo); + } + private boolean isExternalDragWidget(DragObject d) { + return d.dragSource != this && isDragWidget(d); + } + public void onDragOver(DragObject d) { // Skip drag over events while we are dragging over side pages if (mInScrollArea) return; @@ -2825,7 +2823,7 @@ public class Workspace extends SmoothPagedView // Identify whether we have dragged over a side page if (isSmall()) { - if (mLauncher.getHotseat() != null) { + if (mLauncher.getHotseat() != null && !isExternalDragWidget(d)) { mLauncher.getHotseat().getHitRect(r); if (r.contains(d.x, d.y)) { layout = mLauncher.getHotseat().getLayout(); @@ -2862,7 +2860,7 @@ public class Workspace extends SmoothPagedView } } else { // Test to see if we are over the hotseat otherwise just use the current page - if (mLauncher.getHotseat() != null) { + if (mLauncher.getHotseat() != null && !isDragWidget(d)) { mLauncher.getHotseat().getHitRect(r); if (r.contains(d.x, d.y)) { layout = mLauncher.getHotseat().getLayout();