Prevent NPE when shrinking workspace

Change-Id: I61f1793d4db5f3006f2e1bceb0f0c578b35e4e71
This commit is contained in:
Patrick Dubroy committed 2011-01-18 17:09:51 -08:00
1 parent f4ffdc63d3
commit 0dfcf68b58
1 file changed
+13 -8
+13 -8
View File
@@ -1142,25 +1142,30 @@ public class Workspace extends SmoothPagedView
mWaitingToShrinkState = shrinkState;
return;
}
mIsSmall = true;
mShrinkState = shrinkState;
// Stop any scrolling, move to the current page right away
setCurrentPage((mNextPage != INVALID_PAGE) ? mNextPage : mCurrentPage);
if (!mIsDragInProcess) {
updateWhichPagesAcceptDrops(mShrinkState);
updateWhichPagesAcceptDrops(shrinkState);
}
// we intercept and reject all touch events when we're small, so be sure to reset the state
mTouchState = TOUCH_STATE_REST;
mActivePointerId = INVALID_POINTER;
CellLayout currentPage = (CellLayout) getChildAt(mCurrentPage);
if (currentPage == null) {
Log.w(TAG, "currentPage is NULL! mCurrentPage " + mCurrentPage
+ " mNextPage " + mNextPage);
return;
}
if (currentPage.getBackgroundAlphaMultiplier() < 1.0f) {
currentPage.setBackgroundAlpha(0.0f);
}
currentPage.setBackgroundAlphaMultiplier(1.0f);
mIsSmall = true;
mShrinkState = shrinkState;
// we intercept and reject all touch events when we're small, so be sure to reset the state
mTouchState = TOUCH_STATE_REST;
mActivePointerId = INVALID_POINTER;
final Resources res = getResources();
final int screenWidth = getWidth();
final int screenHeight = getHeight();