diff options
| author | Winson Chung <winsonc@google.com> | 2013-09-19 15:55:45 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-09-19 15:56:35 -0700 |
| commit | 7819a56217fd4e216d3675905586b275799723bb (patch) | |
| tree | d88b3d9b1820e5a3081d39401f5b4791c1830fdd /src/com/android/launcher3/PagedView.java | |
| parent | bb701aaa83889b208ba8910e08023c84693138d1 (diff) | |
| download | android_packages_apps_Trebuchet-7819a56217fd4e216d3675905586b275799723bb.tar.gz android_packages_apps_Trebuchet-7819a56217fd4e216d3675905586b275799723bb.tar.bz2 android_packages_apps_Trebuchet-7819a56217fd4e216d3675905586b275799723bb.zip | |
Tweaking page indicators to support add page icon, remembering widget picker page (Bug 10787439)
Change-Id: Iab0b5676aa9c34a610b4b968940abc81c913c234
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index d8fc98330..763dfa1a9 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -337,7 +337,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mPageIndicator = (PageIndicator) parent.findViewById(mPageIndicatorViewId); mPageIndicator.removeAllMarkers(mAllowPagedViewAnimations); - ArrayList<Integer> markers = new ArrayList<Integer>(); + ArrayList<PageIndicator.PageMarkerResources> markers = + new ArrayList<PageIndicator.PageMarkerResources>(); for (int i = 0; i < getChildCount(); ++i) { markers.add(getPageIndicatorMarker(i)); } @@ -424,8 +425,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc PageIndicator getPageIndicator() { return mPageIndicator; } - protected int getPageIndicatorMarker(int pageIndex) { - return R.layout.page_indicator_marker; + protected PageIndicator.PageMarkerResources getPageIndicatorMarker(int pageIndex) { + return new PageIndicator.PageMarkerResources(); } public void setPageSwitchListener(PageSwitchListener pageSwitchListener) { @@ -969,7 +970,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // add/remove pages if (mPageIndicator != null && !isReordering(false)) { int pageIndex = indexOfChild(child); - mPageIndicator.addMarker(pageIndex, getPageIndicatorMarker(pageIndex), + mPageIndicator.addMarker(pageIndex, + getPageIndicatorMarker(pageIndex), mAllowPagedViewAnimations); } |