diff options
| author | Winson Chung <winsonc@google.com> | 2013-11-07 18:51:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-07 18:51:57 +0000 |
| commit | 88416027a3740dacbd97bd2264f22ba51f5c7e21 (patch) | |
| tree | d9249034c4f6eeb5a64f83e042e6d51e69f67c09 /src/com/android/launcher3/PagedView.java | |
| parent | c82d2622bc7305fd3545fe7df97a30187283113f (diff) | |
| parent | 876a619b11bfdf583465b0cc2be67266436558b9 (diff) | |
| download | android_packages_apps_Trebuchet-88416027a3740dacbd97bd2264f22ba51f5c7e21.tar.gz android_packages_apps_Trebuchet-88416027a3740dacbd97bd2264f22ba51f5c7e21.tar.bz2 android_packages_apps_Trebuchet-88416027a3740dacbd97bd2264f22ba51f5c7e21.zip | |
Merge "Fixing crash while reordering pages in OverviewMode." into jb-ub-now-jolly-elf
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 5ff80b8f1..a85065e79 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1817,7 +1817,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc addView(mDragView, pageUnderPointIndex); onAddView(mDragView, pageUnderPointIndex); mSidePageHoverIndex = -1; - mPageIndicator.setActiveMarker(getNextPage()); + if (mPageIndicator != null) { + mPageIndicator.setActiveMarker(getNextPage()); + } } }; postDelayed(mSidePageHoverRunnable, REORDERING_SIDE_PAGE_HOVER_TIMEOUT); |