DO NOT MERGE - Allow the workspace to swipe while it's loading.
You still can't modify the contents of the workspace while it's loading, but this makes it appear a little bit more responsive. Launching apps while the launcher is loading has always been possible. Bug: 2748595 Change-Id: Icf252beaee5b801b30216202ce6032c4d565cde3
This commit is contained in:
@@ -726,7 +726,12 @@ public class AllApps3D extends RSSurfaceView
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean onLongClick(View v) {
|
public boolean onLongClick(View v) {
|
||||||
if (mLocks != 0 || !isVisible()) {
|
// We don't accept long click events in these cases
|
||||||
|
// - If the workspace isn't ready to accept a drop
|
||||||
|
// - If we're not done loading (because we might be confused about which item
|
||||||
|
// to pick up
|
||||||
|
// - If we're not visible
|
||||||
|
if (!isVisible() || mLauncher.isWorkspaceLocked() || mLocks != 0) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (sRollo.checkClickOK() && mCurrentIconIndex == mDownIconIndex
|
if (sRollo.checkClickOK() && mCurrentIconIndex == mDownIconIndex
|
||||||
|
|||||||
@@ -558,9 +558,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
|
|||||||
public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) {
|
public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) {
|
||||||
int screen = indexOfChild(child);
|
int screen = indexOfChild(child);
|
||||||
if (screen != mCurrentScreen || !mScroller.isFinished()) {
|
if (screen != mCurrentScreen || !mScroller.isFinished()) {
|
||||||
if (!mLauncher.isWorkspaceLocked()) {
|
snapToScreen(screen);
|
||||||
snapToScreen(screen);
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@@ -625,7 +623,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
|
|||||||
@Override
|
@Override
|
||||||
public boolean dispatchTouchEvent(MotionEvent ev) {
|
public boolean dispatchTouchEvent(MotionEvent ev) {
|
||||||
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
|
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
|
||||||
if (mLauncher.isWorkspaceLocked() || mLauncher.isAllAppsVisible()) {
|
if (mLauncher.isAllAppsVisible()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -634,9 +632,8 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onInterceptTouchEvent(MotionEvent ev) {
|
public boolean onInterceptTouchEvent(MotionEvent ev) {
|
||||||
final boolean workspaceLocked = mLauncher.isWorkspaceLocked();
|
|
||||||
final boolean allAppsVisible = mLauncher.isAllAppsVisible();
|
final boolean allAppsVisible = mLauncher.isAllAppsVisible();
|
||||||
if (workspaceLocked || allAppsVisible) {
|
if (allAppsVisible) {
|
||||||
return false; // We don't want the events. Let them fall through to the all apps view.
|
return false; // We don't want the events. Let them fall through to the all apps view.
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -840,9 +837,6 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
|
|||||||
@Override
|
@Override
|
||||||
public boolean onTouchEvent(MotionEvent ev) {
|
public boolean onTouchEvent(MotionEvent ev) {
|
||||||
|
|
||||||
if (mLauncher.isWorkspaceLocked()) {
|
|
||||||
return false; // We don't want the events. Let them fall through to the all apps view.
|
|
||||||
}
|
|
||||||
if (mLauncher.isAllAppsVisible()) {
|
if (mLauncher.isAllAppsVisible()) {
|
||||||
// Cancel any scrolling that is in progress.
|
// Cancel any scrolling that is in progress.
|
||||||
if (!mScroller.isFinished()) {
|
if (!mScroller.isFinished()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user