Tweaking page indicators to support add page icon, remembering widget picker page (Bug 10787439)

Change-Id: Iab0b5676aa9c34a610b4b968940abc81c913c234
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index ee33f3a..a36f444 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -941,8 +941,12 @@
     }
 
     public void setContentType(ContentType type) {
+        int page = getCurrentPage();
+        if (mContentType != type) {
+            page = 0;
+        }
         mContentType = type;
-        invalidatePageData(0, true);
+        invalidatePageData(page, true);
     }
 
     public ContentType getContentType() {