diff options
| author | Winson Chung <winsonc@google.com> | 2013-09-20 17:53:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-20 17:53:54 +0000 |
| commit | 37cab1bc25b99e4ac2429f7d965342a534d441b4 (patch) | |
| tree | 1a7182fa35c5f9ce7f50b84273093d30fed00ad6 /src/com/android/launcher3/Workspace.java | |
| parent | 2873ecd1ab2433f6124d8c9c27e2c3b37520a3a5 (diff) | |
| parent | 7819a56217fd4e216d3675905586b275799723bb (diff) | |
| download | android_packages_apps_Trebuchet-37cab1bc25b99e4ac2429f7d965342a534d441b4.tar.gz android_packages_apps_Trebuchet-37cab1bc25b99e4ac2429f7d965342a534d441b4.tar.bz2 android_packages_apps_Trebuchet-37cab1bc25b99e4ac2429f7d965342a534d441b4.zip | |
Merge "Tweaking page indicators to support add page icon, remembering widget picker page (Bug 10787439)" into jb-ub-now-indigo-rose
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 41cea6a94..eb2b19df0 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4225,10 +4225,16 @@ public class Workspace extends SmoothPagedView } @Override - protected int getPageIndicatorMarker(int pageIndex) { - if (getScreenIdForPageIndex(pageIndex) == CUSTOM_CONTENT_SCREEN_ID) { - return R.layout.custom_content_page_indicator_marker; + protected PageIndicator.PageMarkerResources getPageIndicatorMarker(int pageIndex) { + long screenId = getScreenIdForPageIndex(pageIndex); + if (screenId == EXTRA_EMPTY_SCREEN_ID) { + int count = mScreenOrder.size() - (hasCustomContent() ? 1 : 0); + if (count > 1) { + return new PageIndicator.PageMarkerResources(R.drawable.ic_pageindicator_add, + R.drawable.ic_pageindicator_add); + } } + return super.getPageIndicatorMarker(pageIndex); } |