PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3482911: NPE in CustomizePagedView.resetCheckedItem

Browse Source 
Also fixes an issue where quick swipes on an item could
cause it to animate in from (0, 0) sometimes.

Change-Id: Ie3312389bcb5109f4b26ec518a29b4aa88161377
This commit is contained in:
Patrick Dubroy
2011-02-24 12:16:12 -08:00
parent a0aa0121b9
commit 6f13342ffd
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/CustomizePagedView.java
+8 -8
View File
@@ -337,14 +337,15 @@ public class CustomizePagedView extends PagedViewWithDraggableItems
/**
* Similar to resetCheckedGrandchildren, but allows us to specify that it's not animated.
* NOTE: This assumes that only a single item can be checked.
*/
private void resetCheckedItem(boolean animated) {
Checkable checkable = getCheckedGrandchildren().get(0);
if (checkable instanceof PagedViewWidget) {
((PagedViewWidget) checkable).setChecked(false, animated);
} else {
((PagedViewIcon) checkable).setChecked(false, animated);
final Checkable checkable = getSingleCheckedGrandchild();
if (checkable != null) {
if (checkable instanceof PagedViewWidget) {
((PagedViewWidget) checkable).setChecked(false, animated);
} else {
((PagedViewIcon) checkable).setChecked(false, animated);
}
}
}
@@ -353,8 +354,7 @@ public class CustomizePagedView extends PagedViewWithDraggableItems
// Create a view, identical to the drag view, that is only used for animating the
// item onto the home screen (or back to its original position, if the drop failed).
final int[] pos = new int[2];
mDragController.getDragView().getLocationOnScreen(pos);
final int[] pos = mDragController.getDragView().getPosition(null);
final View animView = dragLayer.createDragView(mDragBitmap, pos[0], pos[1]);
animView.setVisibility(View.VISIBLE);