commit 5979117dc26fe8939e7af3116401b4ea93a0adb2
author Joe Onorato <joeo@android.com> Fri Jul 31 16:21:40 2009 -0700
committer Joe Onorato <joeo@android.com> Fri Jul 31 16:24:20 2009 -0700
tree e9f29db4b06d50e260c0a61df26fe90a1e1d56f2
parent 45d434688928c9b581207011482c939b164d28c5

Split the wallpaper into its own view (it will be its own surface some day).

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ef21c61..7e42b8d 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -171,6 +171,7 @@
     private LayoutInflater mInflater;
 
     private DragLayer mDragLayer;
+    private WallpaperView mWallpaperView;
     private Workspace mWorkspace;
 
     private AppWidgetManager mAppWidgetManager;
@@ -539,6 +540,9 @@
         mDragLayer = (DragLayer) findViewById(R.id.drag_layer);
         final DragLayer dragLayer = mDragLayer;
 
+        mWallpaperView = (WallpaperView) dragLayer.findViewById(R.id.wallpaper);
+        final WallpaperView wallpaper = mWallpaperView;
+
         mWorkspace = (Workspace) dragLayer.findViewById(R.id.workspace);
         final Workspace workspace = mWorkspace;
 
@@ -553,7 +557,10 @@
         workspace.setOnLongClickListener(this);
         workspace.setDragger(dragLayer);
         workspace.setLauncher(this);
+        workspace.setWallpaper(wallpaper);
+
         loadWallpaper();
+        wallpaper.setScreenCount(workspace.getScreenCount());
 
         deleteZone.setLauncher(this);
         deleteZone.setDragController(dragLayer);
@@ -1645,7 +1652,7 @@
                 throw new IllegalStateException("The wallpaper must be a BitmapDrawable.");
             }
         }
-        mWorkspace.loadWallpaper(sWallpaper);
+        mWallpaperView.loadWallpaper(sWallpaper);
     }
 
     /**
@@ -1736,14 +1743,6 @@
         return /* TODO !mDrawer.isMoving() && */ !mAllAppsDialog.isOpen;
     }
 
-    boolean isDrawerUp() {
-        return mAllAppsDialog.isOpen; /* TODO && !mDrawer.isMoving();*/
-    }
-
-    boolean isDrawerMoving() {
-        return false; // TODO mDrawer.isMoving();
-    }
-
     Workspace getWorkspace() {
         return mWorkspace;
     }