| commit | f373de17c0192558213f6621d13121dfba5c411b | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Thu Sep 26 19:40:54 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 26 19:40:54 2013 +0000 |
| tree | 00b0036d929d454cd28dfd707deaaa924355a3be | |
| parent | 98928dbed8796458b71b6a89bc48b62d8faf1c7b [diff] | |
| parent | eb1bb920507fe7f27b2ecece5b67749dac7850f3 [diff] |
Merge "Recover when reading corrupted widget previews" into jb-ub-now-indigo-rose
diff --git a/res/drawable-hdpi/focused_bg.9.png b/res/drawable-hdpi/focused_bg.9.png index 5552708..2925ae8 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/ic_allapps.png b/res/drawable-hdpi/ic_allapps.png index f066d16..073bb30 100644 --- a/res/drawable-hdpi/ic_allapps.png +++ b/res/drawable-hdpi/ic_allapps.png Binary files differ
diff --git a/res/drawable-hdpi/ic_allapps_pressed.png b/res/drawable-hdpi/ic_allapps_pressed.png index 1675992..a43b9e1 100644 --- a/res/drawable-hdpi/ic_allapps_pressed.png +++ b/res/drawable-hdpi/ic_allapps_pressed.png Binary files differ
diff --git a/res/drawable-hdpi/page_hover_left_holo.9.png b/res/drawable-hdpi/page_hover_left_holo.9.png index c3243a9..8a1aa5f 100644 --- a/res/drawable-hdpi/page_hover_left_holo.9.png +++ b/res/drawable-hdpi/page_hover_left_holo.9.png Binary files differ
diff --git a/res/drawable-hdpi/page_hover_right_holo.9.png b/res/drawable-hdpi/page_hover_right_holo.9.png index 4c0b1ea..abf8f51 100644 --- a/res/drawable-hdpi/page_hover_right_holo.9.png +++ b/res/drawable-hdpi/page_hover_right_holo.9.png Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_rest.png b/res/drawable-hdpi/portal_ring_rest.png index 8478164..2979b73 100644 --- a/res/drawable-hdpi/portal_ring_rest.png +++ b/res/drawable-hdpi/portal_ring_rest.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 059a9d6..2d6fcf5 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 bc4418f..f0afd61 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 b808170..47613b2 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 bcb8104..acc28be 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 3ec18de..2c60be0 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-mdpi/focused_bg.9.png b/res/drawable-mdpi/focused_bg.9.png index 00f05d8..89c29ac 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/ic_allapps.png b/res/drawable-mdpi/ic_allapps.png index 6994b7b..8c5efd7 100644 --- a/res/drawable-mdpi/ic_allapps.png +++ b/res/drawable-mdpi/ic_allapps.png Binary files differ
diff --git a/res/drawable-mdpi/ic_allapps_pressed.png b/res/drawable-mdpi/ic_allapps_pressed.png index 96581a5..18375ab 100644 --- a/res/drawable-mdpi/ic_allapps_pressed.png +++ b/res/drawable-mdpi/ic_allapps_pressed.png Binary files differ
diff --git a/res/drawable-mdpi/page_hover_left_holo.9.png b/res/drawable-mdpi/page_hover_left_holo.9.png index f436fe7..561d3cd 100644 --- a/res/drawable-mdpi/page_hover_left_holo.9.png +++ b/res/drawable-mdpi/page_hover_left_holo.9.png Binary files differ
diff --git a/res/drawable-mdpi/page_hover_right_holo.9.png b/res/drawable-mdpi/page_hover_right_holo.9.png index 894c263..2681f23 100644 --- a/res/drawable-mdpi/page_hover_right_holo.9.png +++ b/res/drawable-mdpi/page_hover_right_holo.9.png Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_rest.png b/res/drawable-mdpi/portal_ring_rest.png index 3b5ec71..d0a976e 100644 --- a/res/drawable-mdpi/portal_ring_rest.png +++ b/res/drawable-mdpi/portal_ring_rest.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 435f3aa..028bd62 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 848af0a..c838bf4 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 0e62c9c..ff0b0d3 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 5c8d477..fc4808e 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 609e06b..3b1df01 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/focused_bg.9.png b/res/drawable-xhdpi/focused_bg.9.png index b545f8e..197a269 100644 --- a/res/drawable-xhdpi/focused_bg.9.png +++ b/res/drawable-xhdpi/focused_bg.9.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_allapps.png b/res/drawable-xhdpi/ic_allapps.png index 549e30f..21c4252 100644 --- a/res/drawable-xhdpi/ic_allapps.png +++ b/res/drawable-xhdpi/ic_allapps.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png index a703b40..3bbcbce 100644 --- a/res/drawable-xhdpi/ic_allapps_pressed.png +++ b/res/drawable-xhdpi/ic_allapps_pressed.png Binary files differ
diff --git a/res/drawable-xhdpi/page_hover_left_holo.9.png b/res/drawable-xhdpi/page_hover_left_holo.9.png index 6833a59..4972a2e 100644 --- a/res/drawable-xhdpi/page_hover_left_holo.9.png +++ b/res/drawable-xhdpi/page_hover_left_holo.9.png Binary files differ
diff --git a/res/drawable-xhdpi/page_hover_right_holo.9.png b/res/drawable-xhdpi/page_hover_right_holo.9.png index 77376d4..b99461f 100644 --- a/res/drawable-xhdpi/page_hover_right_holo.9.png +++ b/res/drawable-xhdpi/page_hover_right_holo.9.png Binary files differ
diff --git a/res/drawable-xhdpi/portal_ring_rest.png b/res/drawable-xhdpi/portal_ring_rest.png index f0aa06f..ff0369a 100644 --- a/res/drawable-xhdpi/portal_ring_rest.png +++ b/res/drawable-xhdpi/portal_ring_rest.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 270c9b7..76cec60 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 d4b11c9..19437d7 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 6eb7cd0..28c5487 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 01d96ab..4f672a6 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 9066218..e866c00 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/drawable-xxhdpi/focused_bg.9.png b/res/drawable-xxhdpi/focused_bg.9.png new file mode 100644 index 0000000..84d3062 --- /dev/null +++ b/res/drawable-xxhdpi/focused_bg.9.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_allapps.png b/res/drawable-xxhdpi/ic_allapps.png index 500f618..021832a 100644 --- a/res/drawable-xxhdpi/ic_allapps.png +++ b/res/drawable-xxhdpi/ic_allapps.png Binary files differ
diff --git a/res/drawable-xxhdpi/ic_allapps_pressed.png b/res/drawable-xxhdpi/ic_allapps_pressed.png index 54eb057..9c7b636 100644 --- a/res/drawable-xxhdpi/ic_allapps_pressed.png +++ b/res/drawable-xxhdpi/ic_allapps_pressed.png Binary files differ
diff --git a/res/drawable-xxhdpi/page_hover_left_holo.9.png b/res/drawable-xxhdpi/page_hover_left_holo.9.png index cfe5a53..626aafb 100644 --- a/res/drawable-xxhdpi/page_hover_left_holo.9.png +++ b/res/drawable-xxhdpi/page_hover_left_holo.9.png Binary files differ
diff --git a/res/drawable-xxhdpi/page_hover_right_holo.9.png b/res/drawable-xxhdpi/page_hover_right_holo.9.png index 481e791..66257dc 100644 --- a/res/drawable-xxhdpi/page_hover_right_holo.9.png +++ b/res/drawable-xxhdpi/page_hover_right_holo.9.png Binary files differ
diff --git a/res/drawable-xxhdpi/portal_ring_rest.png b/res/drawable-xxhdpi/portal_ring_rest.png index 7a13f72..6fa6a53 100644 --- a/res/drawable-xxhdpi/portal_ring_rest.png +++ b/res/drawable-xxhdpi/portal_ring_rest.png Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_frame_holo.9.png b/res/drawable-xxhdpi/widget_resize_frame_holo.9.png index a38e7d5..1681387 100644 --- a/res/drawable-xxhdpi/widget_resize_frame_holo.9.png +++ b/res/drawable-xxhdpi/widget_resize_frame_holo.9.png Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_handle_bottom.png b/res/drawable-xxhdpi/widget_resize_handle_bottom.png index a241c59..d549fcd 100644 --- a/res/drawable-xxhdpi/widget_resize_handle_bottom.png +++ b/res/drawable-xxhdpi/widget_resize_handle_bottom.png Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_handle_left.png b/res/drawable-xxhdpi/widget_resize_handle_left.png index 24046ea..dd56dad 100644 --- a/res/drawable-xxhdpi/widget_resize_handle_left.png +++ b/res/drawable-xxhdpi/widget_resize_handle_left.png Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_handle_right.png b/res/drawable-xxhdpi/widget_resize_handle_right.png index 968ffe2..296a1c1 100644 --- a/res/drawable-xxhdpi/widget_resize_handle_right.png +++ b/res/drawable-xxhdpi/widget_resize_handle_right.png Binary files differ
diff --git a/res/drawable-xxhdpi/widget_resize_handle_top.png b/res/drawable-xxhdpi/widget_resize_handle_top.png index a2bab29..e86270a 100644 --- a/res/drawable-xxhdpi/widget_resize_handle_top.png +++ b/res/drawable-xxhdpi/widget_resize_handle_top.png Binary files differ
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 56f595c..da6f2f7 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -175,16 +175,10 @@ boolean isVisible = true; boolean isUninstall = false; - // If we are dragging a widget from AppsCustomize, hide the delete target - if (isAllAppsWidget(source, info)) { - isVisible = false; - } - // If we are dragging an application from AppsCustomize, only show the control if we can - // delete the app (it was downloaded), and rename the string to "uninstall" in such a case - if (willAcceptDrop(info)) { - isVisible = true; - } else { + // delete the app (it was downloaded), and rename the string to "uninstall" in such a case. + // Hide the delete target if it is a widget from AppsCustomize. + if (!willAcceptDrop(info) || isAllAppsWidget(source, info)) { isVisible = false; }
