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

am aaf8727e: am 2bf63d52: Fixing issue where you couldn\'t drag an item multiple pages (issue 10754544)

Browse Source 
* commit 'aaf8727eeef17f0b758f83feb79cc861acd28798':
  Fixing issue where you couldn't drag an item multiple pages (issue 10754544)
This commit is contained in:
Adam Cohen
2013-09-29 18:21:18 -07:00
committed by Android Git Automerger
parent cf3d8001e1 aaf8727eee
commit a8901439e7
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DragController.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class DragController {
public static int DRAG_ACTION_COPY = 1;
private static final int SCROLL_DELAY = 500;
private static final int RESCROLL_DELAY = 750;
private static final int RESCROLL_DELAY = PagedView.PAGE_SNAP_ANIMATION_DURATION + 150;
private static final boolean PROFILE_DRAWING_DURING_DRAG = false;
src/com/android/launcher3/PagedView.java
+2 -10
View File
@@ -2153,19 +2153,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
}
public void scrollLeft() {
if (mScroller.isFinished()) {
if (mCurrentPage > 0) snapToPage(mCurrentPage - 1);
} else {
if (mNextPage > 0) snapToPage(mNextPage - 1);
}
if (getNextPage() > 0) snapToPage(getNextPage() - 1);
}
public void scrollRight() {
if (mScroller.isFinished()) {
if (mCurrentPage < getChildCount() -1) snapToPage(mCurrentPage + 1);
} else {
if (mNextPage < getChildCount() -1) snapToPage(mNextPage + 1);
}
if (getNextPage() < getChildCount() -1) snapToPage(getNextPage() + 1);
}
public int getPageForView(View v) {
src/com/android/launcher3/Workspace.java
+2 -10
View File
@@ -1748,25 +1748,17 @@ public class Workspace extends SmoothPagedView
protected void onStartReordering() {
super.onStartReordering();
int count = getChildCount();
for (int i = 0; i < count; i++) {
((CellLayout) getChildAt(i)).setUseActiveGlowBackground(true);
}
showOutlines();
// Reordering handles its own animations, disable the automatic ones.
setLayoutTransition(null);
}
protected void onEndReordering() {
super.onEndReordering();
int count = getChildCount();
for (int i = 0; i < count; i++) {
((CellLayout) getChildAt(i)).setUseActiveGlowBackground(false);
}
hideOutlines();
hideOutlines();
mScreenOrder.clear();
int count = getChildCount();
for (int i = 0; i < count; i++) {
CellLayout cl = ((CellLayout) getChildAt(i));
mScreenOrder.add(getIdForScreen(cl));