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/Workspace.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/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 c0b2ae390..2f58571d4 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4221,10 +4221,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); } |