diff options
138 files changed, 54 insertions, 44 deletions
diff --git a/res/drawable-hdpi/apps_customize_bg.png b/res/drawable-hdpi/apps_customize_bg.png Binary files differindex 81768d71e..284746796 100644 --- a/res/drawable-hdpi/apps_customize_bg.png +++ b/res/drawable-hdpi/apps_customize_bg.png diff --git a/res/drawable-hdpi/apps_hotseat_button.png b/res/drawable-hdpi/apps_hotseat_button.png Binary files differindex c459ba823..15e66dba5 100644 --- a/res/drawable-hdpi/apps_hotseat_button.png +++ b/res/drawable-hdpi/apps_hotseat_button.png diff --git a/res/drawable-hdpi/bg_appwidget_error.9.png b/res/drawable-hdpi/bg_appwidget_error.9.png Binary files differindex 59d9822bc..4da3195d4 100644 --- a/res/drawable-hdpi/bg_appwidget_error.9.png +++ b/res/drawable-hdpi/bg_appwidget_error.9.png diff --git a/res/drawable-hdpi/divider_launcher_holo.9.png b/res/drawable-hdpi/divider_launcher_holo.9.png Binary files differindex 0a1bd2a26..3b7f0007e 100644 --- a/res/drawable-hdpi/divider_launcher_holo.9.png +++ b/res/drawable-hdpi/divider_launcher_holo.9.png diff --git a/res/drawable-hdpi/focused_bg.9.png b/res/drawable-hdpi/focused_bg.9.png Binary files differindex 1b0d3fa40..b118be161 100644 --- a/res/drawable-hdpi/focused_bg.9.png +++ b/res/drawable-hdpi/focused_bg.9.png diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png Binary files differindex 5f83592ef..d2d263c00 100644 --- a/res/drawable-hdpi/gardening_crosshairs.png +++ b/res/drawable-hdpi/gardening_crosshairs.png diff --git a/res/drawable-hdpi/home_press.9.png b/res/drawable-hdpi/home_press.9.png Binary files differindex 743880b0a..ef07011f8 100644 --- a/res/drawable-hdpi/home_press.9.png +++ b/res/drawable-hdpi/home_press.9.png diff --git a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png Binary files differindex ece2afd5b..27106964f 100644 --- a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png +++ b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png diff --git a/res/drawable-hdpi/homescreen_green_normal_holo.9.png b/res/drawable-hdpi/homescreen_green_normal_holo.9.png Binary files differindex 7332c3b37..677250cf0 100644 --- a/res/drawable-hdpi/homescreen_green_normal_holo.9.png +++ b/res/drawable-hdpi/homescreen_green_normal_holo.9.png diff --git a/res/drawable-hdpi/homescreen_green_strong_holo.9.png b/res/drawable-hdpi/homescreen_green_strong_holo.9.png Binary files differindex 190c6cce5..74f4dad36 100644 --- a/res/drawable-hdpi/homescreen_green_strong_holo.9.png +++ b/res/drawable-hdpi/homescreen_green_strong_holo.9.png diff --git a/res/drawable-hdpi/homescreen_small_blue.9.png b/res/drawable-hdpi/homescreen_small_blue.9.png Binary files differindex ddc458ba2..700fadc17 100644 --- a/res/drawable-hdpi/homescreen_small_blue.9.png +++ b/res/drawable-hdpi/homescreen_small_blue.9.png diff --git a/res/drawable-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-hdpi/homescreen_small_blue_strong.9.png Binary files differindex 8f5a74efc..6eab8f265 100644 --- a/res/drawable-hdpi/homescreen_small_blue_strong.9.png +++ b/res/drawable-hdpi/homescreen_small_blue_strong.9.png diff --git a/res/drawable-hdpi/homescreen_small_green.9.png b/res/drawable-hdpi/homescreen_small_green.9.png Binary files differindex 00baae948..6e7090bf4 100644 --- a/res/drawable-hdpi/homescreen_small_green.9.png +++ b/res/drawable-hdpi/homescreen_small_green.9.png diff --git a/res/drawable-hdpi/homescreen_small_green_strong.9.png b/res/drawable-hdpi/homescreen_small_green_strong.9.png Binary files differindex 77baa5296..db1027e48 100644 --- a/res/drawable-hdpi/homescreen_small_green_strong.9.png +++ b/res/drawable-hdpi/homescreen_small_green_strong.9.png diff --git a/res/drawable-hdpi/hotseat_track_holo.9.png b/res/drawable-hdpi/hotseat_track_holo.9.png Binary files differindex f49344fe8..2ce496754 100644 --- a/res/drawable-hdpi/hotseat_track_holo.9.png +++ b/res/drawable-hdpi/hotseat_track_holo.9.png diff --git a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png Binary files differindex 3c7930f10..a0bfc0f90 100644 --- a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-hdpi/ic_launcher_application.png b/res/drawable-hdpi/ic_launcher_application.png Binary files differindex 8074c4c57..882eb148a 100644 --- a/res/drawable-hdpi/ic_launcher_application.png +++ b/res/drawable-hdpi/ic_launcher_application.png diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png Binary files differindex 3dc8b2075..13513e03c 100644 --- a/res/drawable-hdpi/ic_launcher_appwidget.png +++ b/res/drawable-hdpi/ic_launcher_appwidget.png diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/drawable-hdpi/ic_launcher_home.png Binary files differindex 74f6bd7b6..8945ada34 100644 --- a/res/drawable-hdpi/ic_launcher_home.png +++ b/res/drawable-hdpi/ic_launcher_home.png diff --git a/res/drawable-hdpi/ic_launcher_info_active_holo.png b/res/drawable-hdpi/ic_launcher_info_active_holo.png Binary files differindex 83ca11252..c534e5670 100644 --- a/res/drawable-hdpi/ic_launcher_info_active_holo.png +++ b/res/drawable-hdpi/ic_launcher_info_active_holo.png diff --git a/res/drawable-hdpi/ic_launcher_info_normal_holo.png b/res/drawable-hdpi/ic_launcher_info_normal_holo.png Binary files differindex 25fb1ac4c..c9bcd7f37 100644 --- a/res/drawable-hdpi/ic_launcher_info_normal_holo.png +++ b/res/drawable-hdpi/ic_launcher_info_normal_holo.png diff --git a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png Binary files differindex 51f02987a..82b1b5917 100644 --- a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png +++ b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png diff --git a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png Binary files differindex 27a4b5e9d..3fc2e8347 100644 --- a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png +++ b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png diff --git a/res/drawable-hdpi/ic_launcher_wallpaper.png b/res/drawable-hdpi/ic_launcher_wallpaper.png Binary files differindex dcd87097c..5c8ee24bb 100644 --- a/res/drawable-hdpi/ic_launcher_wallpaper.png +++ b/res/drawable-hdpi/ic_launcher_wallpaper.png diff --git a/res/drawable-hdpi/ic_search_normal_holo.png b/res/drawable-hdpi/ic_search_normal_holo.png Binary files differindex 9935f489d..d888214ec 100644 --- a/res/drawable-hdpi/ic_search_normal_holo.png +++ b/res/drawable-hdpi/ic_search_normal_holo.png diff --git a/res/drawable-hdpi/ic_voice_search_holo.png b/res/drawable-hdpi/ic_voice_search_holo.png Binary files differindex e0df1a285..d1ec7e3a8 100644 --- a/res/drawable-hdpi/ic_voice_search_holo.png +++ b/res/drawable-hdpi/ic_voice_search_holo.png diff --git a/res/drawable-hdpi/paged_view_indicator.9.png b/res/drawable-hdpi/paged_view_indicator.9.png Binary files differnew file mode 100644 index 000000000..5b47f4477 --- /dev/null +++ b/res/drawable-hdpi/paged_view_indicator.9.png diff --git a/res/drawable-hdpi/portal_ring_inner_holo.png b/res/drawable-hdpi/portal_ring_inner_holo.png Binary files differindex 7f48e7363..49df9eca8 100644 --- a/res/drawable-hdpi/portal_ring_inner_holo.png +++ b/res/drawable-hdpi/portal_ring_inner_holo.png diff --git a/res/drawable-hdpi/portal_ring_outer_holo.png b/res/drawable-hdpi/portal_ring_outer_holo.png Binary files differindex 4ad47bffe..282d0d77b 100644 --- a/res/drawable-hdpi/portal_ring_outer_holo.png +++ b/res/drawable-hdpi/portal_ring_outer_holo.png diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png Binary files differindex 291af0226..3a59f255f 100644 --- a/res/drawable-hdpi/pressed_application_background.9.png +++ b/res/drawable-hdpi/pressed_application_background.9.png diff --git a/res/drawable-hdpi/preview_bg.9.png b/res/drawable-hdpi/preview_bg.9.png Binary files differindex 5647144af..5fa2ed82c 100644 --- a/res/drawable-hdpi/preview_bg.9.png +++ b/res/drawable-hdpi/preview_bg.9.png diff --git a/res/drawable-hdpi/preview_bg_focus.9.png b/res/drawable-hdpi/preview_bg_focus.9.png Binary files differindex 31200fdcd..bbf67f7a2 100644 --- a/res/drawable-hdpi/preview_bg_focus.9.png +++ b/res/drawable-hdpi/preview_bg_focus.9.png diff --git a/res/drawable-hdpi/preview_bg_press.9.png b/res/drawable-hdpi/preview_bg_press.9.png Binary files differindex 9cb12669e..6d0b02298 100644 --- a/res/drawable-hdpi/preview_bg_press.9.png +++ b/res/drawable-hdpi/preview_bg_press.9.png diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png Binary files differindex 2856da02b..d761b4a55 100644 --- a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png +++ b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png diff --git a/res/drawable-hdpi/wallpaper_picker_preview.png b/res/drawable-hdpi/wallpaper_picker_preview.png Binary files differindex 300ea4a38..b48899acf 100644 --- a/res/drawable-hdpi/wallpaper_picker_preview.png +++ b/res/drawable-hdpi/wallpaper_picker_preview.png diff --git a/res/drawable-hdpi/widget_info_bg.9.png b/res/drawable-hdpi/widget_info_bg.9.png Binary files differindex 217b35cb4..df4cea9dc 100644 --- a/res/drawable-hdpi/widget_info_bg.9.png +++ b/res/drawable-hdpi/widget_info_bg.9.png diff --git a/res/drawable-hdpi/widget_resize_frame_holo.9.png b/res/drawable-hdpi/widget_resize_frame_holo.9.png Binary files differindex 8da665b7a..c41fbcaa3 100644 --- a/res/drawable-hdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-hdpi/widget_resize_frame_holo.9.png diff --git a/res/drawable-hdpi/widget_resize_handle_bottom.png b/res/drawable-hdpi/widget_resize_handle_bottom.png Binary files differindex 495476b7c..e039165fb 100644 --- a/res/drawable-hdpi/widget_resize_handle_bottom.png +++ b/res/drawable-hdpi/widget_resize_handle_bottom.png diff --git a/res/drawable-hdpi/widget_resize_handle_left.png b/res/drawable-hdpi/widget_resize_handle_left.png Binary files differindex c73cf0e2a..bfc2e302d 100644 --- a/res/drawable-hdpi/widget_resize_handle_left.png +++ b/res/drawable-hdpi/widget_resize_handle_left.png diff --git a/res/drawable-hdpi/widget_resize_handle_right.png b/res/drawable-hdpi/widget_resize_handle_right.png Binary files differindex 953230276..a7245b8d0 100644 --- a/res/drawable-hdpi/widget_resize_handle_right.png +++ b/res/drawable-hdpi/widget_resize_handle_right.png diff --git a/res/drawable-hdpi/widget_resize_handle_top.png b/res/drawable-hdpi/widget_resize_handle_top.png Binary files differindex a3d2f7c77..447f59a09 100644 --- a/res/drawable-hdpi/widget_resize_handle_top.png +++ b/res/drawable-hdpi/widget_resize_handle_top.png diff --git a/res/drawable-land-hdpi/divider_launcher_holo.9.png b/res/drawable-land-hdpi/divider_launcher_holo.9.png Binary files differindex f07f6c4b9..23a0f976b 100644 --- a/res/drawable-land-hdpi/divider_launcher_holo.9.png +++ b/res/drawable-land-hdpi/divider_launcher_holo.9.png diff --git a/res/drawable-land-mdpi/divider_launcher_holo.9.png b/res/drawable-land-mdpi/divider_launcher_holo.9.png Binary files differindex ae7734045..7bdf32381 100644 --- a/res/drawable-land-mdpi/divider_launcher_holo.9.png +++ b/res/drawable-land-mdpi/divider_launcher_holo.9.png diff --git a/res/drawable-mdpi/apps_customize_bg.png b/res/drawable-mdpi/apps_customize_bg.png Binary files differindex 81768d71e..284746796 100644 --- a/res/drawable-mdpi/apps_customize_bg.png +++ b/res/drawable-mdpi/apps_customize_bg.png diff --git a/res/drawable-mdpi/apps_hotseat_button.png b/res/drawable-mdpi/apps_hotseat_button.png Binary files differindex f9006a477..62f119d67 100644 --- a/res/drawable-mdpi/apps_hotseat_button.png +++ b/res/drawable-mdpi/apps_hotseat_button.png diff --git a/res/drawable-mdpi/bg_appwidget_error.9.png b/res/drawable-mdpi/bg_appwidget_error.9.png Binary files differindex f222f940b..493c0d454 100644 --- a/res/drawable-mdpi/bg_appwidget_error.9.png +++ b/res/drawable-mdpi/bg_appwidget_error.9.png diff --git a/res/drawable-mdpi/divider_launcher_holo.9.png b/res/drawable-mdpi/divider_launcher_holo.9.png Binary files differindex 6d101f4ce..7bdf32381 100644 --- a/res/drawable-mdpi/divider_launcher_holo.9.png +++ b/res/drawable-mdpi/divider_launcher_holo.9.png diff --git a/res/drawable-mdpi/focused_bg.9.png b/res/drawable-mdpi/focused_bg.9.png Binary files differindex 1b0d3fa40..b118be161 100644 --- a/res/drawable-mdpi/focused_bg.9.png +++ b/res/drawable-mdpi/focused_bg.9.png diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png Binary files differindex 2845fe49e..9d9f3c15e 100644 --- a/res/drawable-mdpi/gardening_crosshairs.png +++ b/res/drawable-mdpi/gardening_crosshairs.png diff --git a/res/drawable-mdpi/home_press.9.png b/res/drawable-mdpi/home_press.9.png Binary files differindex ff841c397..679a1f626 100644 --- a/res/drawable-mdpi/home_press.9.png +++ b/res/drawable-mdpi/home_press.9.png diff --git a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png Binary files differindex fef82bba2..efdc86136 100644 --- a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png +++ b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png diff --git a/res/drawable-mdpi/homescreen_green_normal_holo.9.png b/res/drawable-mdpi/homescreen_green_normal_holo.9.png Binary files differindex dad34d86c..414a5c91a 100644 --- a/res/drawable-mdpi/homescreen_green_normal_holo.9.png +++ b/res/drawable-mdpi/homescreen_green_normal_holo.9.png diff --git a/res/drawable-mdpi/homescreen_green_strong_holo.9.png b/res/drawable-mdpi/homescreen_green_strong_holo.9.png Binary files differindex 901bf4cf9..15f334ee5 100644 --- a/res/drawable-mdpi/homescreen_green_strong_holo.9.png +++ b/res/drawable-mdpi/homescreen_green_strong_holo.9.png diff --git a/res/drawable-mdpi/homescreen_small_blue.9.png b/res/drawable-mdpi/homescreen_small_blue.9.png Binary files differindex 28bc33b18..fb74449a2 100644 --- a/res/drawable-mdpi/homescreen_small_blue.9.png +++ b/res/drawable-mdpi/homescreen_small_blue.9.png diff --git a/res/drawable-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-mdpi/homescreen_small_blue_strong.9.png Binary files differindex f286de9fe..79d84a437 100644 --- a/res/drawable-mdpi/homescreen_small_blue_strong.9.png +++ b/res/drawable-mdpi/homescreen_small_blue_strong.9.png diff --git a/res/drawable-mdpi/homescreen_small_green.9.png b/res/drawable-mdpi/homescreen_small_green.9.png Binary files differindex 58698ea8d..a713f90be 100644 --- a/res/drawable-mdpi/homescreen_small_green.9.png +++ b/res/drawable-mdpi/homescreen_small_green.9.png diff --git a/res/drawable-mdpi/homescreen_small_green_strong.9.png b/res/drawable-mdpi/homescreen_small_green_strong.9.png Binary files differindex 977308579..9884bcd9b 100644 --- a/res/drawable-mdpi/homescreen_small_green_strong.9.png +++ b/res/drawable-mdpi/homescreen_small_green_strong.9.png diff --git a/res/drawable-mdpi/hotseat_track_holo.9.png b/res/drawable-mdpi/hotseat_track_holo.9.png Binary files differindex 3dcab6716..21f1ed123 100644 --- a/res/drawable-mdpi/hotseat_track_holo.9.png +++ b/res/drawable-mdpi/hotseat_track_holo.9.png diff --git a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png Binary files differindex 04749e6f4..ffc302047 100644 --- a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-mdpi/ic_launcher_application.png b/res/drawable-mdpi/ic_launcher_application.png Binary files differindex 18ea7a5fe..d7ff4172c 100644 --- a/res/drawable-mdpi/ic_launcher_application.png +++ b/res/drawable-mdpi/ic_launcher_application.png diff --git a/res/drawable-mdpi/ic_launcher_appwidget.png b/res/drawable-mdpi/ic_launcher_appwidget.png Binary files differindex f369ccdb3..72dbfdf6b 100644 --- a/res/drawable-mdpi/ic_launcher_appwidget.png +++ b/res/drawable-mdpi/ic_launcher_appwidget.png diff --git a/res/drawable-mdpi/ic_launcher_home.png b/res/drawable-mdpi/ic_launcher_home.png Binary files differindex 893d7c7c3..72bd80a2f 100644 --- a/res/drawable-mdpi/ic_launcher_home.png +++ b/res/drawable-mdpi/ic_launcher_home.png diff --git a/res/drawable-mdpi/ic_launcher_info_active_holo.png b/res/drawable-mdpi/ic_launcher_info_active_holo.png Binary files differindex d05de7427..f84b4a6ba 100644 --- a/res/drawable-mdpi/ic_launcher_info_active_holo.png +++ b/res/drawable-mdpi/ic_launcher_info_active_holo.png diff --git a/res/drawable-mdpi/ic_launcher_info_normal_holo.png b/res/drawable-mdpi/ic_launcher_info_normal_holo.png Binary files differindex 6a07cc975..eac578f5c 100644 --- a/res/drawable-mdpi/ic_launcher_info_normal_holo.png +++ b/res/drawable-mdpi/ic_launcher_info_normal_holo.png diff --git a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png Binary files differindex 244fe27dc..0350e558d 100644 --- a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png +++ b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png diff --git a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png Binary files differindex bd5db0816..799b62f8b 100644 --- a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png +++ b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png diff --git a/res/drawable-mdpi/ic_launcher_wallpaper.png b/res/drawable-mdpi/ic_launcher_wallpaper.png Binary files differindex 7e7c6b88a..d2803b1ca 100644 --- a/res/drawable-mdpi/ic_launcher_wallpaper.png +++ b/res/drawable-mdpi/ic_launcher_wallpaper.png diff --git a/res/drawable-mdpi/ic_search_normal_holo.png b/res/drawable-mdpi/ic_search_normal_holo.png Binary files differindex 6acf24bc4..9eb214a9d 100644 --- a/res/drawable-mdpi/ic_search_normal_holo.png +++ b/res/drawable-mdpi/ic_search_normal_holo.png diff --git a/res/drawable-mdpi/ic_voice_search_holo.png b/res/drawable-mdpi/ic_voice_search_holo.png Binary files differindex 29533ba3c..34097b712 100644 --- a/res/drawable-mdpi/ic_voice_search_holo.png +++ b/res/drawable-mdpi/ic_voice_search_holo.png diff --git a/res/drawable-mdpi/paged_view_indicator.9.png b/res/drawable-mdpi/paged_view_indicator.9.png Binary files differindex 9fd357a88..647b60f37 100644 --- a/res/drawable-mdpi/paged_view_indicator.9.png +++ b/res/drawable-mdpi/paged_view_indicator.9.png diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png Binary files differindex 4dbae0626..369e64a45 100644 --- a/res/drawable-mdpi/portal_ring_inner_holo.png +++ b/res/drawable-mdpi/portal_ring_inner_holo.png diff --git a/res/drawable-mdpi/portal_ring_outer_holo.png b/res/drawable-mdpi/portal_ring_outer_holo.png Binary files differindex a70acf25d..842e7bc71 100644 --- a/res/drawable-mdpi/portal_ring_outer_holo.png +++ b/res/drawable-mdpi/portal_ring_outer_holo.png diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png Binary files differindex b09f595b7..7d5da3da2 100644 --- a/res/drawable-mdpi/pressed_application_background.9.png +++ b/res/drawable-mdpi/pressed_application_background.9.png diff --git a/res/drawable-mdpi/preview_bg.9.png b/res/drawable-mdpi/preview_bg.9.png Binary files differindex 82c951d92..d96e88543 100644 --- a/res/drawable-mdpi/preview_bg.9.png +++ b/res/drawable-mdpi/preview_bg.9.png diff --git a/res/drawable-mdpi/preview_bg_focus.9.png b/res/drawable-mdpi/preview_bg_focus.9.png Binary files differindex f64f6a06f..19e82a773 100644 --- a/res/drawable-mdpi/preview_bg_focus.9.png +++ b/res/drawable-mdpi/preview_bg_focus.9.png diff --git a/res/drawable-mdpi/preview_bg_press.9.png b/res/drawable-mdpi/preview_bg_press.9.png Binary files differindex 151cab688..f9380903b 100644 --- a/res/drawable-mdpi/preview_bg_press.9.png +++ b/res/drawable-mdpi/preview_bg_press.9.png diff --git a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png Binary files differindex 20c74a17b..b5e8767b3 100644 --- a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png +++ b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png diff --git a/res/drawable-mdpi/wallpaper_picker_preview.png b/res/drawable-mdpi/wallpaper_picker_preview.png Binary files differindex 300ea4a38..b48899acf 100644 --- a/res/drawable-mdpi/wallpaper_picker_preview.png +++ b/res/drawable-mdpi/wallpaper_picker_preview.png diff --git a/res/drawable-mdpi/widget_info_bg.9.png b/res/drawable-mdpi/widget_info_bg.9.png Binary files differindex 7fd1c20e0..c8c62b58f 100644 --- a/res/drawable-mdpi/widget_info_bg.9.png +++ b/res/drawable-mdpi/widget_info_bg.9.png diff --git a/res/drawable-mdpi/widget_resize_frame_holo.9.png b/res/drawable-mdpi/widget_resize_frame_holo.9.png Binary files differindex 0572f8999..095919f3c 100644 --- a/res/drawable-mdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-mdpi/widget_resize_frame_holo.9.png diff --git a/res/drawable-mdpi/widget_resize_handle_bottom.png b/res/drawable-mdpi/widget_resize_handle_bottom.png Binary files differindex 6c9397322..873d1befe 100644 --- a/res/drawable-mdpi/widget_resize_handle_bottom.png +++ b/res/drawable-mdpi/widget_resize_handle_bottom.png diff --git a/res/drawable-mdpi/widget_resize_handle_left.png b/res/drawable-mdpi/widget_resize_handle_left.png Binary files differindex 71394155b..99a88ac3d 100644 --- a/res/drawable-mdpi/widget_resize_handle_left.png +++ b/res/drawable-mdpi/widget_resize_handle_left.png diff --git a/res/drawable-mdpi/widget_resize_handle_right.png b/res/drawable-mdpi/widget_resize_handle_right.png Binary files differindex 442224b51..ed0a539f7 100644 --- a/res/drawable-mdpi/widget_resize_handle_right.png +++ b/res/drawable-mdpi/widget_resize_handle_right.png diff --git a/res/drawable-mdpi/widget_resize_handle_top.png b/res/drawable-mdpi/widget_resize_handle_top.png Binary files differindex 24358849b..f4159fe04 100644 --- a/res/drawable-mdpi/widget_resize_handle_top.png +++ b/res/drawable-mdpi/widget_resize_handle_top.png diff --git a/res/drawable-xhdpi/apps_customize_bg.png b/res/drawable-xhdpi/apps_customize_bg.png Binary files differnew file mode 100644 index 000000000..a51cc112b --- /dev/null +++ b/res/drawable-xhdpi/apps_customize_bg.png diff --git a/res/drawable-xhdpi/apps_hotseat_button.png b/res/drawable-xhdpi/apps_hotseat_button.png Binary files differnew file mode 100644 index 000000000..932dac7c9 --- /dev/null +++ b/res/drawable-xhdpi/apps_hotseat_button.png diff --git a/res/drawable-xhdpi/bg_appwidget_error.9.png b/res/drawable-xhdpi/bg_appwidget_error.9.png Binary files differnew file mode 100644 index 000000000..b792cc847 --- /dev/null +++ b/res/drawable-xhdpi/bg_appwidget_error.9.png diff --git a/res/drawable-xhdpi/divider_launcher_holo.9.png b/res/drawable-xhdpi/divider_launcher_holo.9.png Binary files differnew file mode 100644 index 000000000..e226ae71e --- /dev/null +++ b/res/drawable-xhdpi/divider_launcher_holo.9.png diff --git a/res/drawable-xhdpi/focused_bg.9.png b/res/drawable-xhdpi/focused_bg.9.png Binary files differnew file mode 100644 index 000000000..d445c59ef --- /dev/null +++ b/res/drawable-xhdpi/focused_bg.9.png diff --git a/res/drawable-xhdpi/gardening_crosshairs.png b/res/drawable-xhdpi/gardening_crosshairs.png Binary files differindex 18c9fbe37..3168463f2 100644 --- a/res/drawable-xhdpi/gardening_crosshairs.png +++ b/res/drawable-xhdpi/gardening_crosshairs.png diff --git a/res/drawable-xhdpi/home_press.9.png b/res/drawable-xhdpi/home_press.9.png Binary files differnew file mode 100644 index 000000000..d9abfd358 --- /dev/null +++ b/res/drawable-xhdpi/home_press.9.png diff --git a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png Binary files differindex 966d0c126..3f8eaf597 100644 --- a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png +++ b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png diff --git a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png b/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png Binary files differdeleted file mode 100644 index 7e037ed03..000000000 --- a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/homescreen_green_normal_holo.9.png b/res/drawable-xhdpi/homescreen_green_normal_holo.9.png Binary files differindex 219db3bf5..4b122136b 100644 --- a/res/drawable-xhdpi/homescreen_green_normal_holo.9.png +++ b/res/drawable-xhdpi/homescreen_green_normal_holo.9.png diff --git a/res/drawable-xhdpi/homescreen_green_strong_holo.9.png b/res/drawable-xhdpi/homescreen_green_strong_holo.9.png Binary files differindex cc71519af..4e414411f 100644 --- a/res/drawable-xhdpi/homescreen_green_strong_holo.9.png +++ b/res/drawable-xhdpi/homescreen_green_strong_holo.9.png diff --git a/res/drawable-xhdpi/homescreen_small_blue.9.png b/res/drawable-xhdpi/homescreen_small_blue.9.png Binary files differnew file mode 100644 index 000000000..e678927ff --- /dev/null +++ b/res/drawable-xhdpi/homescreen_small_blue.9.png diff --git a/res/drawable-xhdpi/homescreen_small_blue_strong.9.png b/res/drawable-xhdpi/homescreen_small_blue_strong.9.png Binary files differnew file mode 100644 index 000000000..696d9071a --- /dev/null +++ b/res/drawable-xhdpi/homescreen_small_blue_strong.9.png diff --git a/res/drawable-xhdpi/homescreen_small_green.9.png b/res/drawable-xhdpi/homescreen_small_green.9.png Binary files differnew file mode 100644 index 000000000..3c4532a1a --- /dev/null +++ b/res/drawable-xhdpi/homescreen_small_green.9.png diff --git a/res/drawable-xhdpi/homescreen_small_green_strong.9.png b/res/drawable-xhdpi/homescreen_small_green_strong.9.png Binary files differnew file mode 100644 index 000000000..c1d4ded44 --- /dev/null +++ b/res/drawable-xhdpi/homescreen_small_green_strong.9.png diff --git a/res/drawable-xhdpi/hotseat_track_holo.9.png b/res/drawable-xhdpi/hotseat_track_holo.9.png Binary files differindex a362a98cc..04004b2ab 100644 --- a/res/drawable-xhdpi/hotseat_track_holo.9.png +++ b/res/drawable-xhdpi/hotseat_track_holo.9.png diff --git a/res/drawable-xhdpi/ic_google_logo_normal_holo.png b/res/drawable-xhdpi/ic_google_logo_normal_holo.png Binary files differdeleted file mode 100644 index 925e0b97f..000000000 --- a/res/drawable-xhdpi/ic_google_logo_normal_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png Binary files differnew file mode 100644 index 000000000..21a51ab6a --- /dev/null +++ b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-xhdpi/ic_launcher_application.png b/res/drawable-xhdpi/ic_launcher_application.png Binary files differnew file mode 100644 index 000000000..83acf89ef --- /dev/null +++ b/res/drawable-xhdpi/ic_launcher_application.png diff --git a/res/drawable-xhdpi/ic_launcher_appwidget.png b/res/drawable-xhdpi/ic_launcher_appwidget.png Binary files differnew file mode 100644 index 000000000..997504abe --- /dev/null +++ b/res/drawable-xhdpi/ic_launcher_appwidget.png diff --git a/res/drawable-xhdpi/ic_launcher_home.png b/res/drawable-xhdpi/ic_launcher_home.png Binary files differnew file mode 100644 index 000000000..7bef13ca7 --- /dev/null +++ b/res/drawable-xhdpi/ic_launcher_home.png diff --git a/res/drawable-xhdpi/ic_launcher_info_active_holo.png b/res/drawable-xhdpi/ic_launcher_info_active_holo.png Binary files differindex 356c0745f..b8cdbc4f8 100644 --- a/res/drawable-xhdpi/ic_launcher_info_active_holo.png +++ b/res/drawable-xhdpi/ic_launcher_info_active_holo.png diff --git a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png Binary files differindex 1f827fa90..f503fb82d 100644 --- a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png +++ b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png Binary files differindex 77cc3e4d9..c155274bd 100644 --- a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png +++ b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png Binary files differindex ce6aff0fc..2ec7ad9b4 100644 --- a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png +++ b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png diff --git a/res/drawable-xhdpi/ic_launcher_wallpaper.png b/res/drawable-xhdpi/ic_launcher_wallpaper.png Binary files differnew file mode 100644 index 000000000..9b0b7b2bc --- /dev/null +++ b/res/drawable-xhdpi/ic_launcher_wallpaper.png diff --git a/res/drawable-xhdpi/ic_search_normal_holo.png b/res/drawable-xhdpi/ic_search_normal_holo.png Binary files differindex 3700a0ca9..0f4caad91 100644 --- a/res/drawable-xhdpi/ic_search_normal_holo.png +++ b/res/drawable-xhdpi/ic_search_normal_holo.png diff --git a/res/drawable-xhdpi/ic_voice_search_holo.png b/res/drawable-xhdpi/ic_voice_search_holo.png Binary files differindex bab4e4906..a4152186d 100644 --- a/res/drawable-xhdpi/ic_voice_search_holo.png +++ b/res/drawable-xhdpi/ic_voice_search_holo.png diff --git a/res/drawable-xhdpi/paged_view_indicator.9.png b/res/drawable-xhdpi/paged_view_indicator.9.png Binary files differnew file mode 100644 index 000000000..fb8a22820 --- /dev/null +++ b/res/drawable-xhdpi/paged_view_indicator.9.png diff --git a/res/drawable-xhdpi/portal_ring_inner_holo.png b/res/drawable-xhdpi/portal_ring_inner_holo.png Binary files differindex fc3d3c0c4..66beb8422 100644 --- a/res/drawable-xhdpi/portal_ring_inner_holo.png +++ b/res/drawable-xhdpi/portal_ring_inner_holo.png diff --git a/res/drawable-xhdpi/portal_ring_outer_holo.png b/res/drawable-xhdpi/portal_ring_outer_holo.png Binary files differindex 43579ec5e..34423fcf3 100644 --- a/res/drawable-xhdpi/portal_ring_outer_holo.png +++ b/res/drawable-xhdpi/portal_ring_outer_holo.png diff --git a/res/drawable-xhdpi/pressed_application_background.9.png b/res/drawable-xhdpi/pressed_application_background.9.png Binary files differnew file mode 100644 index 000000000..05e240a9e --- /dev/null +++ b/res/drawable-xhdpi/pressed_application_background.9.png diff --git a/res/drawable-xhdpi/preview_bg.9.png b/res/drawable-xhdpi/preview_bg.9.png Binary files differnew file mode 100644 index 000000000..11cbcb5a2 --- /dev/null +++ b/res/drawable-xhdpi/preview_bg.9.png diff --git a/res/drawable-xhdpi/preview_bg_focus.9.png b/res/drawable-xhdpi/preview_bg_focus.9.png Binary files differnew file mode 100644 index 000000000..698c465e3 --- /dev/null +++ b/res/drawable-xhdpi/preview_bg_focus.9.png diff --git a/res/drawable-xhdpi/preview_bg_press.9.png b/res/drawable-xhdpi/preview_bg_press.9.png Binary files differnew file mode 100644 index 000000000..78e751099 --- /dev/null +++ b/res/drawable-xhdpi/preview_bg_press.9.png diff --git a/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png b/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png Binary files differnew file mode 100644 index 000000000..d8124f8b6 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png diff --git a/res/drawable-xhdpi/wallpaper_picker_preview.png b/res/drawable-xhdpi/wallpaper_picker_preview.png Binary files differnew file mode 100644 index 000000000..456045511 --- /dev/null +++ b/res/drawable-xhdpi/wallpaper_picker_preview.png diff --git a/res/drawable-xhdpi/widget_info_bg.9.png b/res/drawable-xhdpi/widget_info_bg.9.png Binary files differnew file mode 100644 index 000000000..19eff0589 --- /dev/null +++ b/res/drawable-xhdpi/widget_info_bg.9.png diff --git a/res/drawable-xhdpi/widget_resize_frame_holo.9.png b/res/drawable-xhdpi/widget_resize_frame_holo.9.png Binary files differindex 4988cad19..d09920614 100644 --- a/res/drawable-xhdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-xhdpi/widget_resize_frame_holo.9.png diff --git a/res/drawable-xhdpi/widget_resize_handle_bottom.png b/res/drawable-xhdpi/widget_resize_handle_bottom.png Binary files differindex 18b5a26f8..62882c833 100644 --- a/res/drawable-xhdpi/widget_resize_handle_bottom.png +++ b/res/drawable-xhdpi/widget_resize_handle_bottom.png diff --git a/res/drawable-xhdpi/widget_resize_handle_left.png b/res/drawable-xhdpi/widget_resize_handle_left.png Binary files differindex 40d4e0be8..6f45c9948 100644 --- a/res/drawable-xhdpi/widget_resize_handle_left.png +++ b/res/drawable-xhdpi/widget_resize_handle_left.png diff --git a/res/drawable-xhdpi/widget_resize_handle_right.png b/res/drawable-xhdpi/widget_resize_handle_right.png Binary files differindex 5ca60717b..28437f1c7 100644 --- a/res/drawable-xhdpi/widget_resize_handle_right.png +++ b/res/drawable-xhdpi/widget_resize_handle_right.png diff --git a/res/drawable-xhdpi/widget_resize_handle_top.png b/res/drawable-xhdpi/widget_resize_handle_top.png Binary files differindex 329559cdd..0d187ad2d 100644 --- a/res/drawable-xhdpi/widget_resize_handle_top.png +++ b/res/drawable-xhdpi/widget_resize_handle_top.png diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml index 9dbe2344b..f82d5419e 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 d6482feb5..44ac14cdf 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 a122abbf4..53f3c2093 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" /> -</com.android.launcher2.Hotseat>
\ No newline at end of file +</com.android.launcher2.Hotseat> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index b413c5343..85465b42e 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -17,12 +17,16 @@ <resources> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">12dip</dimen> - <dimen name="toolbar_button_horizontal_padding">10dip</dimen> + <dimen name="toolbar_button_horizontal_padding">4dip</dimen> <!-- Workspace --> + <dimen name="workspace_cell_width">106dp</dimen> + <dimen name="workspace_cell_height">74dp</dimen> + <dimen name="hotseat_cell_width">68dp</dimen> + <dimen name="hotseat_cell_height">74dp</dimen> <!-- Block spacing on each side of the screen --> - <dimen name="workspace_left_padding">12dp</dimen> - <dimen name="workspace_right_padding">12dp</dimen> + <dimen name="workspace_left_padding">0dp</dimen> + <dimen name="workspace_right_padding">0dp</dimen> <!-- We need top/bottom padding for portals to look right, but really only in spring loaded mode... --> <dimen name="workspace_top_padding">0dp</dimen> @@ -33,6 +37,13 @@ <dimen name="workspace_divider_padding_top">12dp</dimen> <dimen name="workspace_divider_padding_bottom">12dp</dimen> + <!-- height of the bottom row of controls --> + <dimen name="button_bar_height">68dip</dimen> + <!-- Because portal animations go beyond the bounds of an icon, we need + to make the dock layout slightly larger than the button_bar_height --> + <dimen name="button_bar_height_padding">8dp</dimen> + <dimen name="button_bar_height_plus_padding">76dp</dimen> + <!-- AppsCustomize --> <dimen name="apps_customize_cell_width">80dp</dimen> <!-- The width can be 76dp because we don't have B padding --> diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 9add35759..088d3fd11 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -20,8 +20,8 @@ <dimen name="workspace_right_padding">0dp</dimen> <!-- Block spacing on each side of the screen. And also padding for the portals to look right. --> - <dimen name="workspace_top_padding">12dp</dimen> - <dimen name="workspace_bottom_padding">12dp</dimen> + <dimen name="workspace_top_padding">2dp</dimen> + <dimen name="workspace_bottom_padding">2dp</dimen> <dimen name="workspace_page_spacing">8dp</dimen> <integer name="apps_customize_cellCountX">4</integer> diff --git a/res/values/colors.xml b/res/values/colors.xml index 71f282c97..1efeb9e49 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -27,13 +27,6 @@ <color name="appwidget_error_color">#FCCC</color> - <color name="drag_outline_color">#6595f9</color> - - <color name="workspace_item_pressed_outline_color">#6595f9</color> - <color name="workspace_item_pressed_glow_color">#0997ff</color> - <color name="workspace_item_focused_outline_color">#6595f9</color> - <color name="workspace_item_focused_glow_color">#0997ff</color> - <color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color> <color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cb354b4b3..eab4044e5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -16,9 +16,11 @@ <resources> <!-- Workspace --> - <dimen name="qsb_bar_height">48dp</dimen> + <dimen name="qsb_bar_height">40dp</dimen> <dimen name="workspace_cell_width">80dp</dimen> - <dimen name="workspace_cell_height">80dp</dimen> + <dimen name="workspace_cell_height">100dp</dimen> + <dimen name="hotseat_cell_width">80dp</dimen> + <dimen name="hotseat_cell_height">64dp</dimen> <dimen name="workspace_width_gap">-1dp</dimen> <dimen name="workspace_height_gap">-1dp</dimen> <dimen name="workspace_max_gap">16dp</dimen> @@ -46,11 +48,11 @@ <dimen name="title_texture_width">120px</dimen> <!-- height of the bottom row of controls --> - <dimen name="button_bar_height">80dip</dimen> + <dimen name="button_bar_height">64dip</dimen> <!-- Because portal animations go beyond the bounds of an icon, we need to make the dock layout slightly larger than the button_bar_height --> <dimen name="button_bar_height_padding">8dp</dimen> - <dimen name="button_bar_height_plus_padding">88dp</dimen> + <dimen name="button_bar_height_plus_padding">72dp</dimen> <!-- Drag padding to add to the drop targets --> <dimen name="drop_target_drag_padding">40dp</dimen> diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index bd3a4bde5..08f337e0d 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 7fbde5471..d0d4bad6e 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 48360feb1..24feb4148 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 26c00ad8d..ec85af399 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(); |
