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

DO NOT MERGE - Allow the workspace to swipe while it's loading.

Browse Source 
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: Iaf203c7358647a9b2211bb7386579ae75b82a698
This commit is contained in:
Joe Onorato
2010-09-01 12:13:25 -07:00
parent ddc9c1fb1a
commit 6b4adbc055
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Workspace.java
+3 -11
View File
@@ -660,9 +660,7 @@ public class Workspace extends ViewGroup
public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) {
int screen = indexOfChild(child);
if (screen != mCurrentScreen || !mScroller.isFinished()) {
if (!mLauncher.isWorkspaceLocked()) {
snapToScreen(screen);
}
snapToScreen(screen);
return true;
}
return false;
@@ -729,8 +727,7 @@ public class Workspace extends ViewGroup
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
// (In XLarge mode, the workspace is shrunken below all apps, and responds to taps
// ie when you click on a mini-screen, it zooms back to that screen)
if (mLauncher.isWorkspaceLocked() ||
(!LauncherApplication.isScreenXLarge() && mLauncher.isAllAppsVisible())) {
if (!LauncherApplication.isScreenXLarge() && mLauncher.isAllAppsVisible()) {
return false;
}
}
@@ -753,12 +750,11 @@ public class Workspace extends ViewGroup
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
final boolean workspaceLocked = mLauncher.isWorkspaceLocked();
final boolean allAppsVisible = mLauncher.isAllAppsVisible();
// (In XLarge mode, the workspace is shrunken below all apps, and responds to taps
// ie when you click on a mini-screen, it zooms back to that screen)
if (workspaceLocked || (!LauncherApplication.isScreenXLarge() && allAppsVisible)) {
if (!LauncherApplication.isScreenXLarge() && allAppsVisible) {
return false; // We don't want the events. Let them fall through to the all apps view.
}
@@ -961,10 +957,6 @@ public class Workspace extends ViewGroup
@Override
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()) {
// Cancel any scrolling that is in progress.
if (!mScroller.isFinished()) {