summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable-hdpi/apps_customize_bg.pngbin108 -> 69 bytes
-rw-r--r--res/drawable-hdpi/apps_hotseat_button.pngbin4932 -> 2090 bytes
-rw-r--r--res/drawable-hdpi/bg_appwidget_error.9.pngbin1314 -> 1285 bytes
-rw-r--r--res/drawable-hdpi/divider_launcher_holo.9.pngbin199 -> 131 bytes
-rw-r--r--res/drawable-hdpi/focused_bg.9.pngbin2864 -> 117 bytes
-rw-r--r--res/drawable-hdpi/gardening_crosshairs.pngbin580 -> 605 bytes
-rw-r--r--res/drawable-hdpi/home_press.9.pngbin195 -> 153 bytes
-rw-r--r--res/drawable-hdpi/homescreen_blue_normal_holo.9.pngbin260 -> 387 bytes
-rw-r--r--res/drawable-hdpi/homescreen_green_normal_holo.9.pngbin271 -> 365 bytes
-rw-r--r--res/drawable-hdpi/homescreen_green_strong_holo.9.pngbin280 -> 374 bytes
-rw-r--r--res/drawable-hdpi/homescreen_small_blue.9.pngbin6411 -> 2098 bytes
-rw-r--r--res/drawable-hdpi/homescreen_small_blue_strong.9.pngbin5470 -> 1942 bytes
-rw-r--r--res/drawable-hdpi/homescreen_small_green.9.pngbin2578 -> 1826 bytes
-rw-r--r--res/drawable-hdpi/homescreen_small_green_strong.9.pngbin5662 -> 1958 bytes
-rw-r--r--res/drawable-hdpi/hotseat_track_holo.9.pngbin138 -> 137 bytes
-rw-r--r--res/drawable-hdpi/ic_home_all_apps_holo_dark.pngbin1676 -> 4135 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_application.pngbin4147 -> 3966 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_appwidget.pngbin7240 -> 6399 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_home.pngbin4211 -> 4048 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_info_active_holo.pngbin4821 -> 4714 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_info_normal_holo.pngbin2497 -> 2692 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_trashcan_active_holo.pngbin2741 -> 2657 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_trashcan_normal_holo.pngbin1701 -> 1750 bytes
-rw-r--r--res/drawable-hdpi/ic_launcher_wallpaper.pngbin4228 -> 4034 bytes
-rw-r--r--res/drawable-hdpi/ic_search_normal_holo.pngbin2257 -> 2402 bytes
-rw-r--r--res/drawable-hdpi/ic_voice_search_holo.pngbin1600 -> 1669 bytes
-rw-r--r--res/drawable-hdpi/paged_view_indicator.9.pngbin0 -> 637 bytes
-rw-r--r--res/drawable-hdpi/portal_ring_inner_holo.pngbin10584 -> 10822 bytes
-rw-r--r--res/drawable-hdpi/portal_ring_outer_holo.pngbin15330 -> 6869 bytes
-rw-r--r--res/drawable-hdpi/pressed_application_background.9.pngbin1572 -> 1348 bytes
-rw-r--r--res/drawable-hdpi/preview_bg.9.pngbin4304 -> 1584 bytes
-rw-r--r--res/drawable-hdpi/preview_bg_focus.9.pngbin4515 -> 1781 bytes
-rw-r--r--res/drawable-hdpi/preview_bg_press.9.pngbin4509 -> 1778 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_nexuswallpaper1.pngbin144280 -> 148002 bytes
-rw-r--r--res/drawable-hdpi/wallpaper_picker_preview.pngbin259142 -> 208322 bytes
-rw-r--r--res/drawable-hdpi/widget_info_bg.9.pngbin168 -> 115 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_frame_holo.9.pngbin3411 -> 854 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_handle_bottom.pngbin769 -> 736 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_handle_left.pngbin753 -> 768 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_handle_right.pngbin756 -> 770 bytes
-rw-r--r--res/drawable-hdpi/widget_resize_handle_top.pngbin769 -> 736 bytes
-rw-r--r--res/drawable-land-hdpi/divider_launcher_holo.9.pngbin2886 -> 133 bytes
-rw-r--r--res/drawable-land-mdpi/divider_launcher_holo.9.pngbin2877 -> 129 bytes
-rw-r--r--res/drawable-mdpi/apps_customize_bg.pngbin108 -> 69 bytes
-rw-r--r--res/drawable-mdpi/apps_hotseat_button.pngbin5186 -> 1736 bytes
-rw-r--r--res/drawable-mdpi/bg_appwidget_error.9.pngbin951 -> 794 bytes
-rw-r--r--res/drawable-mdpi/divider_launcher_holo.9.pngbin1078 -> 129 bytes
-rw-r--r--res/drawable-mdpi/focused_bg.9.pngbin2864 -> 117 bytes
-rw-r--r--res/drawable-mdpi/gardening_crosshairs.pngbin499 -> 498 bytes
-rw-r--r--res/drawable-mdpi/home_press.9.pngbin2846 -> 129 bytes
-rw-r--r--res/drawable-mdpi/homescreen_blue_normal_holo.9.pngbin194 -> 285 bytes
-rw-r--r--res/drawable-mdpi/homescreen_green_normal_holo.9.pngbin195 -> 268 bytes
-rw-r--r--res/drawable-mdpi/homescreen_green_strong_holo.9.pngbin193 -> 271 bytes
-rw-r--r--res/drawable-mdpi/homescreen_small_blue.9.pngbin3600 -> 1749 bytes
-rw-r--r--res/drawable-mdpi/homescreen_small_blue_strong.9.pngbin2446 -> 1647 bytes
-rw-r--r--res/drawable-mdpi/homescreen_small_green.9.pngbin1881 -> 1535 bytes
-rw-r--r--res/drawable-mdpi/homescreen_small_green_strong.9.pngbin2591 -> 1653 bytes
-rw-r--r--res/drawable-mdpi/hotseat_track_holo.9.pngbin129 -> 128 bytes
-rw-r--r--res/drawable-mdpi/ic_home_all_apps_holo_dark.pngbin2478 -> 1647 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_application.pngbin3123 -> 2898 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_appwidget.pngbin5063 -> 4224 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_home.pngbin3615 -> 3116 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_info_active_holo.pngbin2813 -> 2736 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_info_normal_holo.pngbin1501 -> 1518 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_trashcan_active_holo.pngbin1783 -> 1783 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_trashcan_normal_holo.pngbin1154 -> 1109 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_wallpaper.pngbin3035 -> 2850 bytes
-rw-r--r--res/drawable-mdpi/ic_search_normal_holo.pngbin1388 -> 1436 bytes
-rw-r--r--res/drawable-mdpi/ic_voice_search_holo.pngbin1044 -> 1054 bytes
-rw-r--r--res/drawable-mdpi/paged_view_indicator.9.pngbin358 -> 264 bytes
-rw-r--r--res/drawable-mdpi/portal_ring_inner_holo.pngbin5698 -> 5802 bytes
-rw-r--r--res/drawable-mdpi/portal_ring_outer_holo.pngbin7821 -> 4052 bytes
-rw-r--r--res/drawable-mdpi/pressed_application_background.9.pngbin1091 -> 899 bytes
-rw-r--r--res/drawable-mdpi/preview_bg.9.pngbin1109 -> 1042 bytes
-rw-r--r--res/drawable-mdpi/preview_bg_focus.9.pngbin1260 -> 1207 bytes
-rw-r--r--res/drawable-mdpi/preview_bg_press.9.pngbin1244 -> 1188 bytes
-rw-r--r--res/drawable-mdpi/wallpaper_nexuswallpaper1.pngbin144641 -> 71001 bytes
-rw-r--r--res/drawable-mdpi/wallpaper_picker_preview.pngbin259142 -> 208322 bytes
-rw-r--r--res/drawable-mdpi/widget_info_bg.9.pngbin178 -> 116 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_frame_holo.9.pngbin1848 -> 646 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_handle_bottom.pngbin582 -> 585 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_handle_left.pngbin593 -> 598 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_handle_right.pngbin592 -> 595 bytes
-rw-r--r--res/drawable-mdpi/widget_resize_handle_top.pngbin582 -> 584 bytes
-rw-r--r--res/drawable-xhdpi/apps_customize_bg.pngbin0 -> 244 bytes
-rw-r--r--res/drawable-xhdpi/apps_hotseat_button.pngbin0 -> 11217 bytes
-rw-r--r--res/drawable-xhdpi/bg_appwidget_error.9.pngbin0 -> 2387 bytes
-rw-r--r--res/drawable-xhdpi/divider_launcher_holo.9.pngbin0 -> 310 bytes
-rw-r--r--res/drawable-xhdpi/focused_bg.9.pngbin0 -> 222 bytes
-rw-r--r--res/drawable-xhdpi/gardening_crosshairs.pngbin831 -> 766 bytes
-rw-r--r--res/drawable-xhdpi/home_press.9.pngbin0 -> 206 bytes
-rw-r--r--res/drawable-xhdpi/homescreen_blue_normal_holo.9.pngbin241 -> 470 bytes
-rw-r--r--res/drawable-xhdpi/homescreen_blue_strong_holo.9.pngbin245 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/homescreen_green_normal_holo.9.pngbin242 -> 395 bytes
-rw-r--r--res/drawable-xhdpi/homescreen_green_strong_holo.9.pngbin242 -> 400 bytes
-rw-r--r--res/drawable-xhdpi/homescreen_small_blue.9.pngbin0 -> 10692 bytes
-rw-r--r--res/drawable-xhdpi/homescreen_small_blue_strong.9.pngbin0 -> 7127 bytes
-rw-r--r--res/drawable-xhdpi/homescreen_small_green.9.pngbin0 -> 5864 bytes
-rw-r--r--res/drawable-xhdpi/homescreen_small_green_strong.9.pngbin0 -> 7402 bytes
-rw-r--r--res/drawable-xhdpi/hotseat_track_holo.9.pngbin153 -> 152 bytes
-rw-r--r--res/drawable-xhdpi/ic_google_logo_normal_holo.pngbin6653 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_home_all_apps_holo_dark.pngbin0 -> 5890 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_application.pngbin0 -> 7196 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_appwidget.pngbin0 -> 11507 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_home.pngbin0 -> 7810 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_info_active_holo.pngbin6918 -> 6841 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_info_normal_holo.pngbin3735 -> 3837 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_trashcan_active_holo.pngbin3549 -> 3431 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.pngbin2202 -> 2240 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_wallpaper.pngbin0 -> 7201 bytes
-rw-r--r--res/drawable-xhdpi/ic_search_normal_holo.pngbin3195 -> 3290 bytes
-rw-r--r--res/drawable-xhdpi/ic_voice_search_holo.pngbin2157 -> 2242 bytes
-rw-r--r--res/drawable-xhdpi/paged_view_indicator.9.pngbin0 -> 897 bytes
-rw-r--r--res/drawable-xhdpi/portal_ring_inner_holo.pngbin16805 -> 17159 bytes
-rw-r--r--res/drawable-xhdpi/portal_ring_outer_holo.pngbin24789 -> 11108 bytes
-rw-r--r--res/drawable-xhdpi/pressed_application_background.9.pngbin0 -> 2811 bytes
-rw-r--r--res/drawable-xhdpi/preview_bg.9.pngbin0 -> 2989 bytes
-rw-r--r--res/drawable-xhdpi/preview_bg_focus.9.pngbin0 -> 3650 bytes
-rw-r--r--res/drawable-xhdpi/preview_bg_press.9.pngbin0 -> 3640 bytes
-rw-r--r--res/drawable-xhdpi/wallpaper_nexuswallpaper1.pngbin0 -> 513289 bytes
-rw-r--r--res/drawable-xhdpi/wallpaper_picker_preview.pngbin0 -> 334702 bytes
-rw-r--r--res/drawable-xhdpi/widget_info_bg.9.pngbin0 -> 185 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_frame_holo.9.pngbin5257 -> 1420 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_handle_bottom.pngbin1085 -> 1083 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_handle_left.pngbin1107 -> 1123 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_handle_right.pngbin1106 -> 1125 bytes
-rw-r--r--res/drawable-xhdpi/widget_resize_handle_top.pngbin1085 -> 1082 bytes
-rw-r--r--res/layout-land/hotseat.xml4
-rw-r--r--res/layout-land/search_bar.xml4
-rw-r--r--res/layout-large/search_bar.xml6
-rw-r--r--res/layout-port/hotseat.xml6
-rw-r--r--res/layout-port/search_bar.xml4
-rw-r--r--res/layout/apps_customize_pane.xml3
-rw-r--r--res/values-land/dimens.xml17
-rw-r--r--res/values-large/styles.xml2
-rw-r--r--res/values-port/dimens.xml4
-rw-r--r--res/values/colors.xml7
-rw-r--r--res/values/dimens.xml12
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/values/styles.xml18
-rw-r--r--src/com/android/launcher2/AppsCustomizePagedView.java10
-rw-r--r--src/com/android/launcher2/BubbleTextView.java8
-rw-r--r--src/com/android/launcher2/CellLayout.java4
-rw-r--r--src/com/android/launcher2/DragLayer.java5
-rw-r--r--src/com/android/launcher2/Launcher.java70
-rw-r--r--src/com/android/launcher2/LauncherModel.java14
-rw-r--r--src/com/android/launcher2/PagedView.java3
-rw-r--r--src/com/android/launcher2/Utilities.java30
-rw-r--r--src/com/android/launcher2/Workspace.java105
149 files changed, 163 insertions, 177 deletions
diff --git a/res/drawable-hdpi/apps_customize_bg.png b/res/drawable-hdpi/apps_customize_bg.png
index 81768d71e..284746796 100644
--- a/res/drawable-hdpi/apps_customize_bg.png
+++ b/res/drawable-hdpi/apps_customize_bg.png
Binary files differ
diff --git a/res/drawable-hdpi/apps_hotseat_button.png b/res/drawable-hdpi/apps_hotseat_button.png
index c459ba823..15e66dba5 100644
--- a/res/drawable-hdpi/apps_hotseat_button.png
+++ b/res/drawable-hdpi/apps_hotseat_button.png
Binary files differ
diff --git a/res/drawable-hdpi/bg_appwidget_error.9.png b/res/drawable-hdpi/bg_appwidget_error.9.png
index 59d9822bc..4da3195d4 100644
--- a/res/drawable-hdpi/bg_appwidget_error.9.png
+++ b/res/drawable-hdpi/bg_appwidget_error.9.png
Binary files differ
diff --git a/res/drawable-hdpi/divider_launcher_holo.9.png b/res/drawable-hdpi/divider_launcher_holo.9.png
index 0a1bd2a26..3b7f0007e 100644
--- a/res/drawable-hdpi/divider_launcher_holo.9.png
+++ b/res/drawable-hdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/focused_bg.9.png b/res/drawable-hdpi/focused_bg.9.png
index 1b0d3fa40..b118be161 100644
--- a/res/drawable-hdpi/focused_bg.9.png
+++ b/res/drawable-hdpi/focused_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png
index 5f83592ef..d2d263c00 100644
--- a/res/drawable-hdpi/gardening_crosshairs.png
+++ b/res/drawable-hdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/drawable-hdpi/home_press.9.png b/res/drawable-hdpi/home_press.9.png
index 743880b0a..ef07011f8 100644
--- a/res/drawable-hdpi/home_press.9.png
+++ b/res/drawable-hdpi/home_press.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
index ece2afd5b..27106964f 100644
--- a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
+++ b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_green_normal_holo.9.png b/res/drawable-hdpi/homescreen_green_normal_holo.9.png
index 7332c3b37..677250cf0 100644
--- a/res/drawable-hdpi/homescreen_green_normal_holo.9.png
+++ b/res/drawable-hdpi/homescreen_green_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_green_strong_holo.9.png b/res/drawable-hdpi/homescreen_green_strong_holo.9.png
index 190c6cce5..74f4dad36 100644
--- a/res/drawable-hdpi/homescreen_green_strong_holo.9.png
+++ b/res/drawable-hdpi/homescreen_green_strong_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_small_blue.9.png b/res/drawable-hdpi/homescreen_small_blue.9.png
index ddc458ba2..700fadc17 100644
--- a/res/drawable-hdpi/homescreen_small_blue.9.png
+++ b/res/drawable-hdpi/homescreen_small_blue.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-hdpi/homescreen_small_blue_strong.9.png
index 8f5a74efc..6eab8f265 100644
--- a/res/drawable-hdpi/homescreen_small_blue_strong.9.png
+++ b/res/drawable-hdpi/homescreen_small_blue_strong.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_small_green.9.png b/res/drawable-hdpi/homescreen_small_green.9.png
index 00baae948..6e7090bf4 100644
--- a/res/drawable-hdpi/homescreen_small_green.9.png
+++ b/res/drawable-hdpi/homescreen_small_green.9.png
Binary files differ
diff --git a/res/drawable-hdpi/homescreen_small_green_strong.9.png b/res/drawable-hdpi/homescreen_small_green_strong.9.png
index 77baa5296..db1027e48 100644
--- a/res/drawable-hdpi/homescreen_small_green_strong.9.png
+++ b/res/drawable-hdpi/homescreen_small_green_strong.9.png
Binary files differ
diff --git a/res/drawable-hdpi/hotseat_track_holo.9.png b/res/drawable-hdpi/hotseat_track_holo.9.png
index f49344fe8..2ce496754 100644
--- a/res/drawable-hdpi/hotseat_track_holo.9.png
+++ b/res/drawable-hdpi/hotseat_track_holo.9.png
Binary files 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 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
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_application.png b/res/drawable-hdpi/ic_launcher_application.png
index 8074c4c57..882eb148a 100644
--- a/res/drawable-hdpi/ic_launcher_application.png
+++ b/res/drawable-hdpi/ic_launcher_application.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_appwidget.png b/res/drawable-hdpi/ic_launcher_appwidget.png
index 3dc8b2075..13513e03c 100644
--- a/res/drawable-hdpi/ic_launcher_appwidget.png
+++ b/res/drawable-hdpi/ic_launcher_appwidget.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/drawable-hdpi/ic_launcher_home.png
index 74f6bd7b6..8945ada34 100644
--- a/res/drawable-hdpi/ic_launcher_home.png
+++ b/res/drawable-hdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_info_active_holo.png b/res/drawable-hdpi/ic_launcher_info_active_holo.png
index 83ca11252..c534e5670 100644
--- a/res/drawable-hdpi/ic_launcher_info_active_holo.png
+++ b/res/drawable-hdpi/ic_launcher_info_active_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_info_normal_holo.png b/res/drawable-hdpi/ic_launcher_info_normal_holo.png
index 25fb1ac4c..c9bcd7f37 100644
--- a/res/drawable-hdpi/ic_launcher_info_normal_holo.png
+++ b/res/drawable-hdpi/ic_launcher_info_normal_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png
index 51f02987a..82b1b5917 100644
--- a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png
+++ b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png
index 27a4b5e9d..3fc2e8347 100644
--- a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png
+++ b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_wallpaper.png b/res/drawable-hdpi/ic_launcher_wallpaper.png
index dcd87097c..5c8ee24bb 100644
--- a/res/drawable-hdpi/ic_launcher_wallpaper.png
+++ b/res/drawable-hdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_normal_holo.png b/res/drawable-hdpi/ic_search_normal_holo.png
index 9935f489d..d888214ec 100644
--- a/res/drawable-hdpi/ic_search_normal_holo.png
+++ b/res/drawable-hdpi/ic_search_normal_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_voice_search_holo.png b/res/drawable-hdpi/ic_voice_search_holo.png
index e0df1a285..d1ec7e3a8 100644
--- a/res/drawable-hdpi/ic_voice_search_holo.png
+++ b/res/drawable-hdpi/ic_voice_search_holo.png
Binary files 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 000000000..5b47f4477
--- /dev/null
+++ b/res/drawable-hdpi/paged_view_indicator.9.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_inner_holo.png b/res/drawable-hdpi/portal_ring_inner_holo.png
index 7f48e7363..49df9eca8 100644
--- a/res/drawable-hdpi/portal_ring_inner_holo.png
+++ b/res/drawable-hdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_outer_holo.png b/res/drawable-hdpi/portal_ring_outer_holo.png
index 4ad47bffe..282d0d77b 100644
--- a/res/drawable-hdpi/portal_ring_outer_holo.png
+++ b/res/drawable-hdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png
index 291af0226..3a59f255f 100644
--- a/res/drawable-hdpi/pressed_application_background.9.png
+++ b/res/drawable-hdpi/pressed_application_background.9.png
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg.9.png b/res/drawable-hdpi/preview_bg.9.png
index 5647144af..5fa2ed82c 100644
--- a/res/drawable-hdpi/preview_bg.9.png
+++ b/res/drawable-hdpi/preview_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg_focus.9.png b/res/drawable-hdpi/preview_bg_focus.9.png
index 31200fdcd..bbf67f7a2 100644
--- a/res/drawable-hdpi/preview_bg_focus.9.png
+++ b/res/drawable-hdpi/preview_bg_focus.9.png
Binary files differ
diff --git a/res/drawable-hdpi/preview_bg_press.9.png b/res/drawable-hdpi/preview_bg_press.9.png
index 9cb12669e..6d0b02298 100644
--- a/res/drawable-hdpi/preview_bg_press.9.png
+++ b/res/drawable-hdpi/preview_bg_press.9.png
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
index 2856da02b..d761b4a55 100644
--- a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
+++ b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png
Binary files differ
diff --git a/res/drawable-hdpi/wallpaper_picker_preview.png b/res/drawable-hdpi/wallpaper_picker_preview.png
index 300ea4a38..b48899acf 100644
--- a/res/drawable-hdpi/wallpaper_picker_preview.png
+++ b/res/drawable-hdpi/wallpaper_picker_preview.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_info_bg.9.png b/res/drawable-hdpi/widget_info_bg.9.png
index 217b35cb4..df4cea9dc 100644
--- a/res/drawable-hdpi/widget_info_bg.9.png
+++ b/res/drawable-hdpi/widget_info_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_frame_holo.9.png b/res/drawable-hdpi/widget_resize_frame_holo.9.png
index 8da665b7a..c41fbcaa3 100644
--- a/res/drawable-hdpi/widget_resize_frame_holo.9.png
+++ b/res/drawable-hdpi/widget_resize_frame_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_bottom.png b/res/drawable-hdpi/widget_resize_handle_bottom.png
index 495476b7c..e039165fb 100644
--- a/res/drawable-hdpi/widget_resize_handle_bottom.png
+++ b/res/drawable-hdpi/widget_resize_handle_bottom.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_left.png b/res/drawable-hdpi/widget_resize_handle_left.png
index c73cf0e2a..bfc2e302d 100644
--- a/res/drawable-hdpi/widget_resize_handle_left.png
+++ b/res/drawable-hdpi/widget_resize_handle_left.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_right.png b/res/drawable-hdpi/widget_resize_handle_right.png
index 953230276..a7245b8d0 100644
--- a/res/drawable-hdpi/widget_resize_handle_right.png
+++ b/res/drawable-hdpi/widget_resize_handle_right.png
Binary files differ
diff --git a/res/drawable-hdpi/widget_resize_handle_top.png b/res/drawable-hdpi/widget_resize_handle_top.png
index a3d2f7c77..447f59a09 100644
--- a/res/drawable-hdpi/widget_resize_handle_top.png
+++ b/res/drawable-hdpi/widget_resize_handle_top.png
Binary files differ
diff --git a/res/drawable-land-hdpi/divider_launcher_holo.9.png b/res/drawable-land-hdpi/divider_launcher_holo.9.png
index f07f6c4b9..23a0f976b 100644
--- a/res/drawable-land-hdpi/divider_launcher_holo.9.png
+++ b/res/drawable-land-hdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-land-mdpi/divider_launcher_holo.9.png b/res/drawable-land-mdpi/divider_launcher_holo.9.png
index ae7734045..7bdf32381 100644
--- a/res/drawable-land-mdpi/divider_launcher_holo.9.png
+++ b/res/drawable-land-mdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/apps_customize_bg.png b/res/drawable-mdpi/apps_customize_bg.png
index 81768d71e..284746796 100644
--- a/res/drawable-mdpi/apps_customize_bg.png
+++ b/res/drawable-mdpi/apps_customize_bg.png
Binary files differ
diff --git a/res/drawable-mdpi/apps_hotseat_button.png b/res/drawable-mdpi/apps_hotseat_button.png
index f9006a477..62f119d67 100644
--- a/res/drawable-mdpi/apps_hotseat_button.png
+++ b/res/drawable-mdpi/apps_hotseat_button.png
Binary files differ
diff --git a/res/drawable-mdpi/bg_appwidget_error.9.png b/res/drawable-mdpi/bg_appwidget_error.9.png
index f222f940b..493c0d454 100644
--- a/res/drawable-mdpi/bg_appwidget_error.9.png
+++ b/res/drawable-mdpi/bg_appwidget_error.9.png
Binary files differ
diff --git a/res/drawable-mdpi/divider_launcher_holo.9.png b/res/drawable-mdpi/divider_launcher_holo.9.png
index 6d101f4ce..7bdf32381 100644
--- a/res/drawable-mdpi/divider_launcher_holo.9.png
+++ b/res/drawable-mdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/focused_bg.9.png b/res/drawable-mdpi/focused_bg.9.png
index 1b0d3fa40..b118be161 100644
--- a/res/drawable-mdpi/focused_bg.9.png
+++ b/res/drawable-mdpi/focused_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png
index 2845fe49e..9d9f3c15e 100644
--- a/res/drawable-mdpi/gardening_crosshairs.png
+++ b/res/drawable-mdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/drawable-mdpi/home_press.9.png b/res/drawable-mdpi/home_press.9.png
index ff841c397..679a1f626 100644
--- a/res/drawable-mdpi/home_press.9.png
+++ b/res/drawable-mdpi/home_press.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
index fef82bba2..efdc86136 100644
--- a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
+++ b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_green_normal_holo.9.png b/res/drawable-mdpi/homescreen_green_normal_holo.9.png
index dad34d86c..414a5c91a 100644
--- a/res/drawable-mdpi/homescreen_green_normal_holo.9.png
+++ b/res/drawable-mdpi/homescreen_green_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_green_strong_holo.9.png b/res/drawable-mdpi/homescreen_green_strong_holo.9.png
index 901bf4cf9..15f334ee5 100644
--- a/res/drawable-mdpi/homescreen_green_strong_holo.9.png
+++ b/res/drawable-mdpi/homescreen_green_strong_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_small_blue.9.png b/res/drawable-mdpi/homescreen_small_blue.9.png
index 28bc33b18..fb74449a2 100644
--- a/res/drawable-mdpi/homescreen_small_blue.9.png
+++ b/res/drawable-mdpi/homescreen_small_blue.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-mdpi/homescreen_small_blue_strong.9.png
index f286de9fe..79d84a437 100644
--- a/res/drawable-mdpi/homescreen_small_blue_strong.9.png
+++ b/res/drawable-mdpi/homescreen_small_blue_strong.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_small_green.9.png b/res/drawable-mdpi/homescreen_small_green.9.png
index 58698ea8d..a713f90be 100644
--- a/res/drawable-mdpi/homescreen_small_green.9.png
+++ b/res/drawable-mdpi/homescreen_small_green.9.png
Binary files differ
diff --git a/res/drawable-mdpi/homescreen_small_green_strong.9.png b/res/drawable-mdpi/homescreen_small_green_strong.9.png
index 977308579..9884bcd9b 100644
--- a/res/drawable-mdpi/homescreen_small_green_strong.9.png
+++ b/res/drawable-mdpi/homescreen_small_green_strong.9.png
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_track_holo.9.png b/res/drawable-mdpi/hotseat_track_holo.9.png
index 3dcab6716..21f1ed123 100644
--- a/res/drawable-mdpi/hotseat_track_holo.9.png
+++ b/res/drawable-mdpi/hotseat_track_holo.9.png
Binary files 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 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
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_application.png b/res/drawable-mdpi/ic_launcher_application.png
index 18ea7a5fe..d7ff4172c 100644
--- a/res/drawable-mdpi/ic_launcher_application.png
+++ b/res/drawable-mdpi/ic_launcher_application.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_appwidget.png b/res/drawable-mdpi/ic_launcher_appwidget.png
index f369ccdb3..72dbfdf6b 100644
--- a/res/drawable-mdpi/ic_launcher_appwidget.png
+++ b/res/drawable-mdpi/ic_launcher_appwidget.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_home.png b/res/drawable-mdpi/ic_launcher_home.png
index 893d7c7c3..72bd80a2f 100644
--- a/res/drawable-mdpi/ic_launcher_home.png
+++ b/res/drawable-mdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_info_active_holo.png b/res/drawable-mdpi/ic_launcher_info_active_holo.png
index d05de7427..f84b4a6ba 100644
--- a/res/drawable-mdpi/ic_launcher_info_active_holo.png
+++ b/res/drawable-mdpi/ic_launcher_info_active_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_info_normal_holo.png b/res/drawable-mdpi/ic_launcher_info_normal_holo.png
index 6a07cc975..eac578f5c 100644
--- a/res/drawable-mdpi/ic_launcher_info_normal_holo.png
+++ b/res/drawable-mdpi/ic_launcher_info_normal_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png
index 244fe27dc..0350e558d 100644
--- a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png
+++ b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png
index bd5db0816..799b62f8b 100644
--- a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png
+++ b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_wallpaper.png b/res/drawable-mdpi/ic_launcher_wallpaper.png
index 7e7c6b88a..d2803b1ca 100644
--- a/res/drawable-mdpi/ic_launcher_wallpaper.png
+++ b/res/drawable-mdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_normal_holo.png b/res/drawable-mdpi/ic_search_normal_holo.png
index 6acf24bc4..9eb214a9d 100644
--- a/res/drawable-mdpi/ic_search_normal_holo.png
+++ b/res/drawable-mdpi/ic_search_normal_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_voice_search_holo.png b/res/drawable-mdpi/ic_voice_search_holo.png
index 29533ba3c..34097b712 100644
--- a/res/drawable-mdpi/ic_voice_search_holo.png
+++ b/res/drawable-mdpi/ic_voice_search_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/paged_view_indicator.9.png b/res/drawable-mdpi/paged_view_indicator.9.png
index 9fd357a88..647b60f37 100644
--- a/res/drawable-mdpi/paged_view_indicator.9.png
+++ b/res/drawable-mdpi/paged_view_indicator.9.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png
index 4dbae0626..369e64a45 100644
--- a/res/drawable-mdpi/portal_ring_inner_holo.png
+++ b/res/drawable-mdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_outer_holo.png b/res/drawable-mdpi/portal_ring_outer_holo.png
index a70acf25d..842e7bc71 100644
--- a/res/drawable-mdpi/portal_ring_outer_holo.png
+++ b/res/drawable-mdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png
index b09f595b7..7d5da3da2 100644
--- a/res/drawable-mdpi/pressed_application_background.9.png
+++ b/res/drawable-mdpi/pressed_application_background.9.png
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg.9.png b/res/drawable-mdpi/preview_bg.9.png
index 82c951d92..d96e88543 100644
--- a/res/drawable-mdpi/preview_bg.9.png
+++ b/res/drawable-mdpi/preview_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg_focus.9.png b/res/drawable-mdpi/preview_bg_focus.9.png
index f64f6a06f..19e82a773 100644
--- a/res/drawable-mdpi/preview_bg_focus.9.png
+++ b/res/drawable-mdpi/preview_bg_focus.9.png
Binary files differ
diff --git a/res/drawable-mdpi/preview_bg_press.9.png b/res/drawable-mdpi/preview_bg_press.9.png
index 151cab688..f9380903b 100644
--- a/res/drawable-mdpi/preview_bg_press.9.png
+++ b/res/drawable-mdpi/preview_bg_press.9.png
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
index 20c74a17b..b5e8767b3 100644
--- a/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
+++ b/res/drawable-mdpi/wallpaper_nexuswallpaper1.png
Binary files differ
diff --git a/res/drawable-mdpi/wallpaper_picker_preview.png b/res/drawable-mdpi/wallpaper_picker_preview.png
index 300ea4a38..b48899acf 100644
--- a/res/drawable-mdpi/wallpaper_picker_preview.png
+++ b/res/drawable-mdpi/wallpaper_picker_preview.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_info_bg.9.png b/res/drawable-mdpi/widget_info_bg.9.png
index 7fd1c20e0..c8c62b58f 100644
--- a/res/drawable-mdpi/widget_info_bg.9.png
+++ b/res/drawable-mdpi/widget_info_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_frame_holo.9.png b/res/drawable-mdpi/widget_resize_frame_holo.9.png
index 0572f8999..095919f3c 100644
--- a/res/drawable-mdpi/widget_resize_frame_holo.9.png
+++ b/res/drawable-mdpi/widget_resize_frame_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_bottom.png b/res/drawable-mdpi/widget_resize_handle_bottom.png
index 6c9397322..873d1befe 100644
--- a/res/drawable-mdpi/widget_resize_handle_bottom.png
+++ b/res/drawable-mdpi/widget_resize_handle_bottom.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_left.png b/res/drawable-mdpi/widget_resize_handle_left.png
index 71394155b..99a88ac3d 100644
--- a/res/drawable-mdpi/widget_resize_handle_left.png
+++ b/res/drawable-mdpi/widget_resize_handle_left.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_right.png b/res/drawable-mdpi/widget_resize_handle_right.png
index 442224b51..ed0a539f7 100644
--- a/res/drawable-mdpi/widget_resize_handle_right.png
+++ b/res/drawable-mdpi/widget_resize_handle_right.png
Binary files differ
diff --git a/res/drawable-mdpi/widget_resize_handle_top.png b/res/drawable-mdpi/widget_resize_handle_top.png
index 24358849b..f4159fe04 100644
--- a/res/drawable-mdpi/widget_resize_handle_top.png
+++ b/res/drawable-mdpi/widget_resize_handle_top.png
Binary files differ
diff --git a/res/drawable-xhdpi/apps_customize_bg.png b/res/drawable-xhdpi/apps_customize_bg.png
new file mode 100644
index 000000000..a51cc112b
--- /dev/null
+++ b/res/drawable-xhdpi/apps_customize_bg.png
Binary files differ
diff --git a/res/drawable-xhdpi/apps_hotseat_button.png b/res/drawable-xhdpi/apps_hotseat_button.png
new file mode 100644
index 000000000..932dac7c9
--- /dev/null
+++ b/res/drawable-xhdpi/apps_hotseat_button.png
Binary files 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 000000000..b792cc847
--- /dev/null
+++ b/res/drawable-xhdpi/bg_appwidget_error.9.png
Binary files 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 000000000..e226ae71e
--- /dev/null
+++ b/res/drawable-xhdpi/divider_launcher_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/focused_bg.9.png b/res/drawable-xhdpi/focused_bg.9.png
new file mode 100644
index 000000000..d445c59ef
--- /dev/null
+++ b/res/drawable-xhdpi/focused_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/gardening_crosshairs.png b/res/drawable-xhdpi/gardening_crosshairs.png
index 18c9fbe37..3168463f2 100644
--- a/res/drawable-xhdpi/gardening_crosshairs.png
+++ b/res/drawable-xhdpi/gardening_crosshairs.png
Binary files differ
diff --git a/res/drawable-xhdpi/home_press.9.png b/res/drawable-xhdpi/home_press.9.png
new file mode 100644
index 000000000..d9abfd358
--- /dev/null
+++ b/res/drawable-xhdpi/home_press.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
index 966d0c126..3f8eaf597 100644
--- a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
+++ b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
Binary files 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 7e037ed03..000000000
--- a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_green_normal_holo.9.png b/res/drawable-xhdpi/homescreen_green_normal_holo.9.png
index 219db3bf5..4b122136b 100644
--- a/res/drawable-xhdpi/homescreen_green_normal_holo.9.png
+++ b/res/drawable-xhdpi/homescreen_green_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/homescreen_green_strong_holo.9.png b/res/drawable-xhdpi/homescreen_green_strong_holo.9.png
index cc71519af..4e414411f 100644
--- a/res/drawable-xhdpi/homescreen_green_strong_holo.9.png
+++ b/res/drawable-xhdpi/homescreen_green_strong_holo.9.png
Binary files 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 000000000..e678927ff
--- /dev/null
+++ b/res/drawable-xhdpi/homescreen_small_blue.9.png
Binary files 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 000000000..696d9071a
--- /dev/null
+++ b/res/drawable-xhdpi/homescreen_small_blue_strong.9.png
Binary files 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 000000000..3c4532a1a
--- /dev/null
+++ b/res/drawable-xhdpi/homescreen_small_green.9.png
Binary files 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 000000000..c1d4ded44
--- /dev/null
+++ b/res/drawable-xhdpi/homescreen_small_green_strong.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/hotseat_track_holo.9.png b/res/drawable-xhdpi/hotseat_track_holo.9.png
index a362a98cc..04004b2ab 100644
--- a/res/drawable-xhdpi/hotseat_track_holo.9.png
+++ b/res/drawable-xhdpi/hotseat_track_holo.9.png
Binary files 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 925e0b97f..000000000
--- a/res/drawable-xhdpi/ic_google_logo_normal_holo.png
+++ /dev/null
Binary files 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 000000000..21a51ab6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_application.png b/res/drawable-xhdpi/ic_launcher_application.png
new file mode 100644
index 000000000..83acf89ef
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_application.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_appwidget.png b/res/drawable-xhdpi/ic_launcher_appwidget.png
new file mode 100644
index 000000000..997504abe
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_appwidget.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_home.png b/res/drawable-xhdpi/ic_launcher_home.png
new file mode 100644
index 000000000..7bef13ca7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_info_active_holo.png b/res/drawable-xhdpi/ic_launcher_info_active_holo.png
index 356c0745f..b8cdbc4f8 100644
--- a/res/drawable-xhdpi/ic_launcher_info_active_holo.png
+++ b/res/drawable-xhdpi/ic_launcher_info_active_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png
index 1f827fa90..f503fb82d 100644
--- a/res/drawable-xhdpi/ic_launcher_info_normal_holo.png
+++ b/res/drawable-xhdpi/ic_launcher_info_normal_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png
index 77cc3e4d9..c155274bd 100644
--- a/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png
+++ b/res/drawable-xhdpi/ic_launcher_trashcan_active_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png
index ce6aff0fc..2ec7ad9b4 100644
--- a/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png
+++ b/res/drawable-xhdpi/ic_launcher_trashcan_normal_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_wallpaper.png b/res/drawable-xhdpi/ic_launcher_wallpaper.png
new file mode 100644
index 000000000..9b0b7b2bc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_wallpaper.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_normal_holo.png b/res/drawable-xhdpi/ic_search_normal_holo.png
index 3700a0ca9..0f4caad91 100644
--- a/res/drawable-xhdpi/ic_search_normal_holo.png
+++ b/res/drawable-xhdpi/ic_search_normal_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_voice_search_holo.png b/res/drawable-xhdpi/ic_voice_search_holo.png
index bab4e4906..a4152186d 100644
--- a/res/drawable-xhdpi/ic_voice_search_holo.png
+++ b/res/drawable-xhdpi/ic_voice_search_holo.png
Binary files 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 000000000..fb8a22820
--- /dev/null
+++ b/res/drawable-xhdpi/paged_view_indicator.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/portal_ring_inner_holo.png b/res/drawable-xhdpi/portal_ring_inner_holo.png
index fc3d3c0c4..66beb8422 100644
--- a/res/drawable-xhdpi/portal_ring_inner_holo.png
+++ b/res/drawable-xhdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/portal_ring_outer_holo.png b/res/drawable-xhdpi/portal_ring_outer_holo.png
index 43579ec5e..34423fcf3 100644
--- a/res/drawable-xhdpi/portal_ring_outer_holo.png
+++ b/res/drawable-xhdpi/portal_ring_outer_holo.png
Binary files 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 000000000..05e240a9e
--- /dev/null
+++ b/res/drawable-xhdpi/pressed_application_background.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/preview_bg.9.png b/res/drawable-xhdpi/preview_bg.9.png
new file mode 100644
index 000000000..11cbcb5a2
--- /dev/null
+++ b/res/drawable-xhdpi/preview_bg.9.png
Binary files 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 000000000..698c465e3
--- /dev/null
+++ b/res/drawable-xhdpi/preview_bg_focus.9.png
Binary files 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 000000000..78e751099
--- /dev/null
+++ b/res/drawable-xhdpi/preview_bg_press.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png b/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png
new file mode 100644
index 000000000..d8124f8b6
--- /dev/null
+++ b/res/drawable-xhdpi/wallpaper_nexuswallpaper1.png
Binary files differ
diff --git a/res/drawable-xhdpi/wallpaper_picker_preview.png b/res/drawable-xhdpi/wallpaper_picker_preview.png
new file mode 100644
index 000000000..456045511
--- /dev/null
+++ b/res/drawable-xhdpi/wallpaper_picker_preview.png
Binary files 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 000000000..19eff0589
--- /dev/null
+++ b/res/drawable-xhdpi/widget_info_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_frame_holo.9.png b/res/drawable-xhdpi/widget_resize_frame_holo.9.png
index 4988cad19..d09920614 100644
--- a/res/drawable-xhdpi/widget_resize_frame_holo.9.png
+++ b/res/drawable-xhdpi/widget_resize_frame_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_bottom.png b/res/drawable-xhdpi/widget_resize_handle_bottom.png
index 18b5a26f8..62882c833 100644
--- a/res/drawable-xhdpi/widget_resize_handle_bottom.png
+++ b/res/drawable-xhdpi/widget_resize_handle_bottom.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_left.png b/res/drawable-xhdpi/widget_resize_handle_left.png
index 40d4e0be8..6f45c9948 100644
--- a/res/drawable-xhdpi/widget_resize_handle_left.png
+++ b/res/drawable-xhdpi/widget_resize_handle_left.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_right.png b/res/drawable-xhdpi/widget_resize_handle_right.png
index 5ca60717b..28437f1c7 100644
--- a/res/drawable-xhdpi/widget_resize_handle_right.png
+++ b/res/drawable-xhdpi/widget_resize_handle_right.png
Binary files differ
diff --git a/res/drawable-xhdpi/widget_resize_handle_top.png b/res/drawable-xhdpi/widget_resize_handle_top.png
index 329559cdd..0d187ad2d 100644
--- a/res/drawable-xhdpi/widget_resize_handle_top.png
+++ b/res/drawable-xhdpi/widget_resize_handle_top.png
Binary files differ
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-land/search_bar.xml b/res/layout-land/search_bar.xml
index 0dbfd7b35..452a80c22 100644
--- a/res/layout-land/search_bar.xml
+++ b/res/layout-land/search_bar.xml
@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:src="@drawable/ic_search_normal_holo"
android:adjustViewBounds="true"
- android:background="@drawable/button_bg"
+ android:background="?android:attr/selectableItemBackground"
android:onClick="onClickSearchButton"
android:focusable="true"
android:clickable="true"
@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:src="@drawable/ic_voice_search_holo"
android:adjustViewBounds="true"
- android:background="@drawable/button_bg"
+ android:background="?android:attr/selectableItemBackground"
android:onClick="onClickVoiceButton"
android:focusable="true"
android:clickable="true"
diff --git a/res/layout-large/search_bar.xml b/res/layout-large/search_bar.xml
index e26a96a48..44ac14cdf 100644
--- a/res/layout-large/search_bar.xml
+++ b/res/layout-large/search_bar.xml
@@ -28,7 +28,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:src="@drawable/ic_search_normal_holo"
- android:background="@drawable/button_bg"
+ android:background="?android:attr/selectableItemBackground"
android:onClick="onClickSearchButton"
android:focusable="true"
android:clickable="true"
@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/search_divider"
android:src="@drawable/ic_voice_search_holo"
- android:background="@drawable/button_bg"
+ android:background="?android:attr/selectableItemBackground"
android:onClick="onClickVoiceButton"
android:focusable="true"
android:clickable="true"
@@ -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/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 0de290a04..b65da0b65 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -27,7 +27,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/voice_button"
- android:background="@drawable/button_bg"
+ android:background="?android:attr/selectableItemBackground"
android:onClick="onClickSearchButton"
android:focusable="true"
android:clickable="true"
@@ -50,7 +50,7 @@
android:layout_alignParentTop="true"
android:src="@drawable/ic_voice_search_holo"
android:adjustViewBounds="true"
- android:background="@drawable/button_bg"
+ android:background="?android:attr/selectableItemBackground"
android:onClick="onClickVoiceButton"
android:focusable="true"
android:clickable="true"
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index c27715308..788d4c335 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -15,7 +15,8 @@
-->
<com.android.launcher2.AppsCustomizeTabHost
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ android:background="#FF000000">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
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-large/styles.xml b/res/values-large/styles.xml
index ea1a8e635..41bd9cd22 100644
--- a/res/values-large/styles.xml
+++ b/res/values-large/styles.xml
@@ -94,7 +94,7 @@
</style>
<style name="DropTargetButton">
<item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center_vertical</item>
<item name="android:drawablePadding">7.5dp</item>
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..5289ebd80 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>
@@ -35,7 +37,7 @@
<!-- AllApps/Customize/AppsCustomize -->
<dimen name="apps_customize_tab_bar_height">56dp</dimen>
- <dimen name="app_icon_size">56dp</dimen>
+ <dimen name="app_icon_size">48dp</dimen>
<!-- The width can be 72dp because we don't have L/R padding -->
<dimen name="apps_customize_cell_width">72dp</dimen>
<dimen name="apps_customize_cell_height">80dp</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/res/values/strings.xml b/res/values/strings.xml
index e8c8d0087..125520e1f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -45,8 +45,8 @@
<string name="widgets_tab_label">Widgets</string>
<!-- AppsCustomize pane -->
- <!-- Message to tell the user to long-press on a widget to add it [CHAR_LIMIT=50] -->
- <string name="long_press_widget_to_add">Long-press to pick up a widget</string>
+ <!-- Message to tell the user to press and hold on a widget to add it [CHAR_LIMIT=50] -->
+ <string name="long_press_widget_to_add">Touch &amp; hold to pick up a widget</string>
<!-- Market button text. The market button text is removed in Launcher.java
in the Phone UI. [CHAR LIMIT=32] -->
<string name="market">Shop</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b356a424b..be9b0fd2c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -39,18 +39,18 @@
</style>
<style name="WorkspaceIcon.Portrait">
- <item name="android:drawablePadding">4dp</item>
+ <item name="android:drawablePadding">8dp</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
- <item name="android:paddingTop">4dp</item>
+ <item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">4dp</item>
</style>
<style name="WorkspaceIcon.Landscape">
- <item name="android:drawablePadding">0dp</item>
+ <item name="android:drawablePadding">4dp</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
- <item name="android:paddingTop">2dp</item>
+ <item name="android:paddingTop">6dp</item>
<item name="android:paddingBottom">4dp</item>
</style>
@@ -66,18 +66,18 @@
<style name="WorkspaceIcon.Portrait.AppsCustomize">
<item name="android:background">@null</item>
- <item name="android:paddingTop">0dp</item>
+ <item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">0dp</item>
<item name="android:paddingLeft">0dp</item>
<item name="android:paddingRight">0dp</item>
- <item name="android:drawablePadding">4dp</item>
+ <item name="android:drawablePadding">8dp</item>
<item name="android:includeFontPadding">false</item>
</style>
<style name="WorkspaceIcon.Landscape.AppsCustomize">
<item name="android:background">@null</item>
- <item name="android:paddingTop">0dp</item>
+ <item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">0dp</item>
- <item name="android:drawablePadding">2dp</item>
+ <item name="android:drawablePadding">6dp</item>
<item name="android:includeFontPadding">false</item>
</style>
@@ -104,7 +104,7 @@
</style>
<style name="DropTargetButton">
<item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center_vertical</item>
<item name="android:drawablePadding">7.5dp</item>
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index e5fe7bd26..53d154ff0 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -228,6 +228,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
// (top + bottom)
mWidgetPreviewIconPaddedDimension =
(int) (mAppIconSize * (1 + (2 * sWidgetPreviewIconPaddingPercentage)));
+ mFadeInAdjacentScreens = LauncherApplication.isScreenLarge();
}
@Override
@@ -567,7 +568,9 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
layout.allowHardwareLayerCreation();
layout.createHardwareLayers();
- prepareGenerateHoloOutlinesTask(page, items, images);
+ if (mFadeInAdjacentScreens) {
+ prepareGenerateHoloOutlinesTask(page, items, images);
+ }
}
/**
@@ -929,7 +932,10 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
invalidate();
forceUpdateAdjacentPagesAlpha();
- prepareGenerateHoloOutlinesTask(data.page, data.items, data.generatedImages);
+
+ if (mFadeInAdjacentScreens) {
+ prepareGenerateHoloOutlinesTask(data.page, data.items, data.generatedImages);
+ }
}
private void onHolographicPageItemsLoaded(AsyncTaskPageData data) {
// Invalidate early to short-circuit children invalidates
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/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 0a3c96dc4..d9d048788 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -1528,8 +1528,8 @@ public class CellLayout extends ViewGroup {
int smallerSize = Math.min(actualWidth, actualHeight);
// Always round up to next largest cell
- int spanX = (width + smallerSize) / smallerSize;
- int spanY = (height + smallerSize) / smallerSize;
+ int spanX = (int) Math.ceil(width / (float) smallerSize);
+ int spanY = (int) Math.ceil(height / (float) smallerSize);
if (result == null) {
return new int[] { spanX, spanY };
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/Launcher.java b/src/com/android/launcher2/Launcher.java
index b132870be..1af3f71d2 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -436,6 +436,7 @@ public final class Launcher extends Activity
* a configuration step, this allows the proper animations to run after other transitions.
*/
private boolean completeAdd(PendingAddArguments args) {
+ boolean result = false;
switch (args.requestCode) {
case REQUEST_PICK_APPLICATION:
completeAddApplication(args.intent, args.container, args.screen, args.cellX,
@@ -447,19 +448,24 @@ public final class Launcher extends Activity
case REQUEST_CREATE_SHORTCUT:
completeAddShortcut(args.intent, args.container, args.screen, args.cellX,
args.cellY);
- return true;
+ result = true;
+ break;
case REQUEST_PICK_APPWIDGET:
addAppWidgetFromPick(args.intent);
break;
case REQUEST_CREATE_APPWIDGET:
int appWidgetId = args.intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
completeAddAppWidget(appWidgetId, args.container, args.screen);
- return true;
+ result = true;
+ break;
case REQUEST_PICK_WALLPAPER:
// We just wanted the activity result here so we can clear mWaitingForResult
break;
}
- return false;
+ // In any situation where we have a multi-step drop, we should reset the add info only after
+ // we complete the drop
+ resetAddInfo();
+ return result;
}
@Override
@@ -629,7 +635,6 @@ public final class Launcher extends Activity
}
State state = intToState(savedState.getInt(RUNTIME_STATE, State.WORKSPACE.ordinal()));
-
if (state == State.APPS_CUSTOMIZE) {
showAllApps(false);
}
@@ -910,8 +915,9 @@ public final class Launcher extends Activity
mDragLayer.clearAllResizeFrames();
updateRunning();
- // Reset AllApps to it's initial state
- if (mAppsCustomizeContent != null) {
+ // Reset AllApps to it's initial state only if we are not in the middle of
+ // processing a multi-step drop
+ if (mAppsCustomizeContent != null && mPendingAddInfo.container == ItemInfo.NO_ID) {
mAppsCustomizeContent.reset();
}
} else if (Intent.ACTION_USER_PRESENT.equals(action)) {
@@ -1195,43 +1201,6 @@ public final class Launcher extends Activity
appSearchData, globalSearch);
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- super.onCreateOptionsMenu(menu);
- return true;
- }
-
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- super.onPrepareOptionsMenu(menu);
-
- startWallpaper();
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case MENU_ADD:
- addItems();
- return true;
- case MENU_MANAGE_APPS:
- manageApps();
- return true;
- case MENU_WALLPAPER_SETTINGS:
- startWallpaper();
- return true;
- case MENU_SEARCH:
- onSearchRequested();
- return true;
- case MENU_NOTIFICATIONS:
- showNotifications();
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
-
/**
* Indicates that we want global search for this activity by setting the globalSearch
* argument for {@link #startSearch} to true.
@@ -2214,7 +2183,12 @@ public final class Launcher extends Activity
@Override
public void run() {
exitSpringLoadedDragMode();
+
if (successfulDrop) {
+ // Before we show workspace, hide all apps again because
+ // exitSpringLoadedDragMode made it visible. This is a bit hacky; we should
+ // clean up our state transition functions
+ mAppsCustomizeTabHost.setVisibility(View.GONE);
showWorkspace(true);
}
}
@@ -2581,20 +2555,12 @@ public final class Launcher extends Activity
}
/**
- * Receives notifications when applications are added/removed.
+ * Receives notifications when system dialogs are to be closed.
*/
private class CloseSystemDialogsIntentReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
closeSystemDialogs();
- String reason = intent.getStringExtra("reason");
- if (!"homekey".equals(reason)) {
- boolean animate = true;
- if (mPaused || "lock".equals(reason)) {
- animate = false;
- }
- showWorkspace(animate);
- }
}
}
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 6658f07c2..157348312 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -382,8 +382,7 @@ public class LauncherModel extends BroadcastReceiver {
final ContentResolver cr = context.getContentResolver();
item.onAddToDatabase(values);
- Launcher l = (Launcher) context;
- LauncherApplication app = (LauncherApplication) l.getApplication();
+ LauncherApplication app = (LauncherApplication) context.getApplicationContext();
item.id = app.getLauncherProvider().generateNewId();
values.put(LauncherSettings.Favorites._ID, item.id);
item.updateValuesWithCoordinates(values, item.cellX, item.cellY);
@@ -1512,7 +1511,7 @@ public class LauncherModel extends BroadcastReceiver {
// the db
if (icon == null) {
if (c != null) {
- icon = getIconFromCursor(c, iconIndex);
+ icon = getIconFromCursor(c, iconIndex, context);
}
}
// the fallback icon
@@ -1582,7 +1581,7 @@ public class LauncherModel extends BroadcastReceiver {
}
// the db
if (icon == null) {
- icon = getIconFromCursor(c, iconIndex);
+ icon = getIconFromCursor(c, iconIndex, context);
}
// the fallback icon
if (icon == null) {
@@ -1591,7 +1590,7 @@ public class LauncherModel extends BroadcastReceiver {
}
break;
case LauncherSettings.Favorites.ICON_TYPE_BITMAP:
- icon = getIconFromCursor(c, iconIndex);
+ icon = getIconFromCursor(c, iconIndex, context);
if (icon == null) {
icon = getFallbackIcon();
info.customIcon = false;
@@ -1610,14 +1609,15 @@ public class LauncherModel extends BroadcastReceiver {
return info;
}
- Bitmap getIconFromCursor(Cursor c, int iconIndex) {
+ Bitmap getIconFromCursor(Cursor c, int iconIndex, Context context) {
if (false) {
Log.d(TAG, "getIconFromCursor app="
+ c.getString(c.getColumnIndexOrThrow(LauncherSettings.Favorites.TITLE)));
}
byte[] data = c.getBlob(iconIndex);
try {
- return BitmapFactory.decodeByteArray(data, 0, data.length);
+ return Utilities.createIconBitmap(
+ BitmapFactory.decodeByteArray(data, 0, data.length), context);
} catch (Exception e) {
return null;
}
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/Utilities.java b/src/com/android/launcher2/Utilities.java
index c63c82206..b537f7acc 100644
--- a/src/com/android/launcher2/Utilities.java
+++ b/src/com/android/launcher2/Utilities.java
@@ -76,8 +76,32 @@ final class Utilities {
}
/**
- * Returns a bitmap suitable for the all apps view. The bitmap will be a power
- * of two sized ARGB_8888 bitmap that can be used as a gl texture.
+ * Returns a bitmap suitable for the all apps view. Used to convert pre-ICS
+ * icon bitmaps that are stored in the database (which were 74x74 pixels at hdpi size)
+ * to the proper size (48dp)
+ */
+ static Bitmap createIconBitmap(Bitmap icon, Context context) {
+ int textureWidth = sIconTextureWidth;
+ int textureHeight = sIconTextureHeight;
+ int sourceWidth = icon.getWidth();
+ int sourceHeight = icon.getHeight();
+ if (sourceWidth > textureWidth && sourceHeight > textureHeight) {
+ // Icon is bigger than it should be; clip it (solves the GB->ICS migration case)
+ return Bitmap.createBitmap(icon,
+ (sourceWidth - textureWidth) / 2,
+ (sourceHeight - textureHeight) / 2,
+ textureWidth, textureHeight);
+ } else if (sourceWidth == textureWidth && sourceHeight == textureHeight) {
+ // Icon is the right size, no need to change it
+ return icon;
+ } else {
+ // Icon is too small, render to a larger bitmap
+ return createIconBitmap(new BitmapDrawable(icon), context);
+ }
+ }
+
+ /**
+ * Returns a bitmap suitable for the all apps view.
*/
static Bitmap createIconBitmap(Drawable icon, Context context) {
synchronized (sCanvas) { // we share the statics :-(
@@ -103,7 +127,7 @@ final class Utilities {
int sourceWidth = icon.getIntrinsicWidth();
int sourceHeight = icon.getIntrinsicHeight();
- if (sourceWidth > 0 && sourceWidth > 0) {
+ if (sourceWidth > 0 && sourceHeight > 0) {
// There are intrinsic sizes.
if (width < sourceWidth || height < sourceHeight) {
// It's too big, scale it down.
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 26c00ad8d..ce3aad4fb 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1000,37 +1000,7 @@ public class Workspace extends SmoothPagedView
mDrawBackground = true;
}
- private void showBackgroundGradientForAllApps(boolean animated) {
- showBackgroundGradient(animated);
- }
-
- private void showBackgroundGradient(boolean animated) {
- if (mBackground == null) return;
- if (mBackgroundFadeOutAnimation != null) {
- mBackgroundFadeOutAnimation.cancel();
- mBackgroundFadeOutAnimation = null;
- }
- if (mBackgroundFadeInAnimation != null) {
- mBackgroundFadeInAnimation.cancel();
- mBackgroundFadeInAnimation = null;
- }
- final float finalAlpha = 1f;
- if (animated) {
- mBackgroundFadeInAnimation = ValueAnimator.ofFloat(getBackgroundAlpha(), finalAlpha);
- mBackgroundFadeInAnimation.addUpdateListener(new AnimatorUpdateListener() {
- public void onAnimationUpdate(ValueAnimator animation) {
- setBackgroundAlpha(((Float) animation.getAnimatedValue()).floatValue());
- }
- });
- mBackgroundFadeInAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
- mBackgroundFadeInAnimation.setDuration(BACKGROUND_FADE_IN_DURATION);
- mBackgroundFadeInAnimation.start();
- } else {
- setBackgroundAlpha(finalAlpha);
- }
- }
-
- private void hideBackgroundGradient(float finalAlpha, boolean animated) {
+ private void animateBackgroundGradient(float finalAlpha, boolean animated) {
if (mBackground == null) return;
if (mBackgroundFadeInAnimation != null) {
mBackgroundFadeInAnimation.cancel();
@@ -1040,18 +1010,21 @@ public class Workspace extends SmoothPagedView
mBackgroundFadeOutAnimation.cancel();
mBackgroundFadeOutAnimation = null;
}
- if (animated) {
- mBackgroundFadeOutAnimation = ValueAnimator.ofFloat(getBackgroundAlpha(), finalAlpha);
- mBackgroundFadeOutAnimation.addUpdateListener(new AnimatorUpdateListener() {
- public void onAnimationUpdate(ValueAnimator animation) {
- setBackgroundAlpha(((Float) animation.getAnimatedValue()).floatValue());
- }
- });
- mBackgroundFadeOutAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
- mBackgroundFadeOutAnimation.setDuration(BACKGROUND_FADE_OUT_DURATION);
- mBackgroundFadeOutAnimation.start();
- } else {
- setBackgroundAlpha(finalAlpha);
+ float startAlpha = getBackgroundAlpha();
+ if (finalAlpha != startAlpha) {
+ if (animated) {
+ mBackgroundFadeOutAnimation = ValueAnimator.ofFloat(startAlpha, finalAlpha);
+ mBackgroundFadeOutAnimation.addUpdateListener(new AnimatorUpdateListener() {
+ public void onAnimationUpdate(ValueAnimator animation) {
+ setBackgroundAlpha(((Float) animation.getAnimatedValue()).floatValue());
+ }
+ });
+ mBackgroundFadeOutAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
+ mBackgroundFadeOutAnimation.setDuration(BACKGROUND_FADE_OUT_DURATION);
+ mBackgroundFadeOutAnimation.start();
+ } else {
+ setBackgroundAlpha(finalAlpha);
+ }
}
}
@@ -1552,8 +1525,6 @@ public class Workspace extends SmoothPagedView
updateWallpaperOffsetImmediately();
}
setChildrenDrawnWithCacheEnabled(true);
-
- showBackgroundGradientForAllApps(animated);
}
@Override
@@ -1925,8 +1896,16 @@ public class Workspace extends SmoothPagedView
}
}
- hideBackgroundGradient(springLoaded ? getResources().getInteger(
- R.integer.config_appsCustomizeSpringLoadedBgAlpha) / 100f : 0f, animated);
+ if (springLoaded) {
+ // Right now we're covered by Apps Customize
+ // Show the background gradient immediately, so the gradient will
+ // be showing once AppsCustomize disappears
+ animateBackgroundGradient(getResources().getInteger(
+ R.integer.config_appsCustomizeSpringLoadedBgAlpha) / 100f, false);
+ } else {
+ // Fade the background gradient away
+ animateBackgroundGradient(0f, true);
+ }
}
/**
@@ -1970,7 +1949,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 +1974,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 +1990,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 +2020,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 +2274,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 +2778,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 +2802,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 +2839,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();