summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Folder.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2010-08-25 17:46:15 -0700
committerMichael Jurka <mikejurka@google.com>2010-09-01 14:54:34 -0700
commit0142d49e1378a7155bcca1fb59965d9e73016dbc (patch)
tree36d700bbf061564e34f359c2ef009ede5f88d20f /src/com/android/launcher2/Folder.java
parent6b4adbc0558fcebbd44998bd00dcd334ddbee32d (diff)
downloadandroid_packages_apps_Trebuchet-0142d49e1378a7155bcca1fb59965d9e73016dbc.tar.gz
android_packages_apps_Trebuchet-0142d49e1378a7155bcca1fb59965d9e73016dbc.tar.bz2
android_packages_apps_Trebuchet-0142d49e1378a7155bcca1fb59965d9e73016dbc.zip
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
Diffstat (limited to 'src/com/android/launcher2/Folder.java')
-rw-r--r--src/com/android/launcher2/Folder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 4d7c6668c..018b28456 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -148,7 +148,7 @@ public class Folder extends LinearLayout implements DragSource, OnItemLongClickL
void onClose() {
final Workspace workspace = mLauncher.getWorkspace();
- workspace.getChildAt(workspace.getCurrentScreen()).requestFocus();
+ workspace.getChildAt(workspace.getCurrentPage()).requestFocus();
}
void bind(FolderInfo info) {