From 7819a56217fd4e216d3675905586b275799723bb Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 19 Sep 2013 15:55:45 -0700
Subject: Tweaking page indicators to support add page icon, remembering widget
 picker page (Bug 10787439)

Change-Id: Iab0b5676aa9c34a610b4b968940abc81c913c234
---
 src/com/android/launcher3/Workspace.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/com/android/launcher3/Workspace.java')

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);
     }
 
-- 
cgit v1.2.3