commit 9b9fb967b2305413520dc676d6d3c472b2b6b25e
author Winson Chung <winsonc@google.com> Fri Nov 15 15:39:34 2013 -0800
committer Winson Chung <winsonc@google.com> Fri Nov 15 15:46:27 2013 -0800
tree 0e2f84b1327fb342ae1dddf0990999a0e4be0606
parent 603d19a333d53f537591107751b327cfc7b856fc

Updating LauncherModel filtering to use screen ids. (Bug 11685286)

- Fixes the issue with the current page not synchronously binding

Change-Id: I3dfa45cc1777f846c77f3e86059dfb715553e1a3

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 89abd9f..7d84a3c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -459,7 +459,7 @@
             } else {
                 // We only load the page synchronously if the user rotates (or triggers a
                 // configuration change) while launcher is in the foreground
-                mModel.startLoader(true, mWorkspace.getCurrentPage());
+                mModel.startLoader(true, mWorkspace.getRestorePage());
             }
         }
 
@@ -1801,7 +1801,8 @@
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         if (mWorkspace.getChildCount() > 0) {
-            outState.putInt(RUNTIME_STATE_CURRENT_SCREEN, mWorkspace.getRestorePage());
+            outState.putInt(RUNTIME_STATE_CURRENT_SCREEN,
+                    mWorkspace.getCurrentPageOffsetFromCustomContent());
         }
         super.onSaveInstanceState(outState);