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

am 68ffd10d: Passion - Maybe this will fix bug 2183130 - NPE in AllAppsView.onTouchEvent.

Browse Source 
Merge commit '68ffd10dfcc7913082183d23949df25c23001e6c' into eclair-mr2

* commit '68ffd10dfcc7913082183d23949df25c23001e6c':
  Passion - Maybe this will fix bug 2183130 - NPE in AllAppsView.onTouchEvent.
This commit is contained in:
Joe Onorato
2009-10-15 19:07:15 -07:00
committed by Android Git Automerger
parent 9dd000dfac 68ffd10dfc
commit b968a73f55
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/AllAppsView.java
+7 -5
View File
@@ -69,8 +69,9 @@ public class AllAppsView extends RSSurfaceView
/** Bit for mLocks for when there are icons being loaded. */
private static final int LOCK_ICONS_PENDING = 1;
private static final int TRACKING_FLING = 0;
private static final int TRACKING_HOME = 1;
private static final int TRACKING_NONE = 0;
private static final int TRACKING_FLING = 1;
private static final int TRACKING_HOME = 2;
private Launcher mLauncher;
private DragController mDragController;
@@ -258,7 +259,7 @@ public class AllAppsView extends RSSurfaceView
case MotionEvent.ACTION_OUTSIDE:
if (mTouchTracking == TRACKING_HOME) {
// TODO: highlight?
} else {
} else if (mTouchTracking == TRACKING_FLING) {
int rawX = (int)ev.getRawX();
int rawY = (int)ev.getRawY();
int slop;
@@ -306,7 +307,7 @@ public class AllAppsView extends RSSurfaceView
mLauncher.closeAllApps(true);
}
}
} else {
} else if (mTouchTracking == TRACKING_FLING) {
mRollo.mState.newTouchDown = 0;
if (mRotateMove) {
mRollo.mState.newPositionX = ev.getRawY() / mDefines.SCREEN_WIDTH_PX;
@@ -330,8 +331,9 @@ public class AllAppsView extends RSSurfaceView
mVelocity.recycle();
mVelocity = null;
}
break;
}
mTouchTracking = TRACKING_NONE;
break;
}
return true;