commit 0142d49e1378a7155bcca1fb59965d9e73016dbc
author Michael Jurka <mikejurka@google.com> Wed Aug 25 17:46:15 2010 -0700
committer Michael Jurka <mikejurka@google.com> Wed Sep 01 14:54:34 2010 -0700
tree 36d700bbf061564e34f359c2ef009ede5f88d20f
parent 6b4adbc0558fcebbd44998bd00dcd334ddbee32d

Changed Workspace to inherit from PagedView

- adds support for seeing dimmed side-pages on
home
- adds workspace support for pages that are
smaller than workspace itself
- removing a lot of code duplicated between
PagedView and Workspace
- tested new Workspace on Nexus One, and perf.
was indistinguishable from old Workspace in my
tests

Change-Id: Ie33ab4e8b35ac01b22894cff66650bb0ece8dfcc

src/com/android/launcher2/Folder.java

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 4d7c666..018b284 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -148,7 +148,7 @@
 
     void onClose() {
         final Workspace workspace = mLauncher.getWorkspace();
-        workspace.getChildAt(workspace.getCurrentScreen()).requestFocus();
+        workspace.getChildAt(workspace.getCurrentPage()).requestFocus();
     }
 
     void bind(FolderInfo info) {