commit fe2ea24b75b1e83188b4ede8b147145afd1713d8
author The Android Automerger <android-build@android.com> Wed Jan 12 07:43:08 2011 -0800
committer The Android Automerger <android-build@android.com> Wed Jan 12 07:43:08 2011 -0800
tree 15d90e44a0d298cd36d8ba47afb49318cfe44f85
parent 340c5f3a708efa280a120708594247952ca65182
parent e9d36465507467681e6aa1fdbfa282984132d12e

merge in honeycomb-release history after reset to honeycomb

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index fd389ca..19e775b 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -625,6 +625,7 @@
             child.setId(childId);
 
             addView(child, index, lp);
+            child.setAlpha(getAlpha());
             if (child instanceof VisibilityChangedBroadcaster) {
                 VisibilityChangedBroadcaster v = (VisibilityChangedBroadcaster) child;
                 v.setVisibilityChangedListener(this);
@@ -972,6 +973,7 @@
             }
         }
         prepareCacheBitmap();
+        invalidateCache();
     }
 
     @Override

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 7faa520..d0f52cb 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -550,12 +550,12 @@
         WallpaperManager wpm = (WallpaperManager)getSystemService(WALLPAPER_SERVICE);
 
         Display display = getWindowManager().getDefaultDisplay();
-        // TODO: Put back when we decide about scrolling the wallpaper
-        // boolean isPortrait = display.getWidth() < display.getHeight();
-        // final int width = isPortrait ? display.getWidth() : display.getHeight();
-        // final int height = isPortrait ? display.getHeight() : display.getWidth();
-        wpm.suggestDesiredDimensions(Math.max(display.getWidth(), display.getHeight()),
-                Math.max(display.getWidth(), display.getHeight()));
+        boolean isPortrait = display.getWidth() < display.getHeight();
+        // find width and height when in portrait mode
+        final int width = isPortrait ? display.getWidth() : display.getHeight();
+        final int height = isPortrait ? display.getHeight() : display.getWidth();
+        wpm.suggestDesiredDimensions((int) (Math.max(width, height) * 1.5f),
+                Math.max(width, height));
     }
 
     // Note: This doesn't do all the client-id magic that BrowserProvider does

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 9fcd1b4..d65f692 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -394,7 +394,7 @@
     @Override
     void setCurrentPage(int currentPage) {
         super.setCurrentPage(currentPage);
-        updateWallpaperOffset(mScrollX);
+        updateWallpaperOffset();
     }
 
     /**
@@ -558,19 +558,25 @@
         Launcher.setScreen(mCurrentPage);
     };
 
-    private void updateWallpaperOffset(int scrollRange) {
-        final boolean isStaticWallpaper = (mWallpaperManager != null) &&
-                (mWallpaperManager.getWallpaperInfo() == null);
-        if (LauncherApplication.isScreenXLarge() && !isStaticWallpaper) {
+    private void updateWallpaperOffset() {
+        if (LauncherApplication.isScreenXLarge()) {
             IBinder token = getWindowToken();
+            int scrollRange = getChildOffset(getChildCount() - 1) - getChildOffset(0);
             if (token != null) {
-                mWallpaperManager.setWallpaperOffsetSteps(1.0f / (getChildCount() - 1), 0 );
+                mWallpaperManager.setWallpaperOffsetSteps(1.0f / (getChildCount() - 1), 0);
+                float offset = mScrollX / (float) scrollRange;
                 mWallpaperManager.setWallpaperOffsets(getWindowToken(),
-                        Math.max(0.f, Math.min(mScrollX/(float)scrollRange, 1.f)), 0);
+                        Math.max(0.f, Math.min(offset, 1.0f)), 0);
             }
         }
     }
 
+    @Override
+    public void computeScroll() {
+        super.computeScroll();
+        updateWallpaperOffset();
+    }
+
     public void showOutlines() {
         if (!mIsSmall && !mIsInUnshrinkAnimation) {
             if (mChildrenOutlineFadeOutAnimation != null) mChildrenOutlineFadeOutAnimation.cancel();
@@ -780,9 +786,6 @@
         // Draw the background gradient if necessary
         if (mBackground != null && mBackgroundAlpha > 0.0f) {
             int alpha = (int) (mBackgroundAlpha * 255);
-            mBackground.setAlpha(alpha);
-            mBackground.setBounds(mScrollX, 0, mScrollX + getMeasuredWidth(), getMeasuredHeight());
-            mBackground.draw(canvas);
             if (mDrawCustomizeTrayBackground) {
                 // Find out where to offset the gradient for the customization tray content
                 mCustomizationDrawer.getLocationOnScreen(mCustomizationDrawerPos);
@@ -800,9 +803,15 @@
                 // Draw the bg gradient
                 final int  offset = (int) (mCustomizationDrawerPos[1] +
                         mCustomizationDrawerTransformedPos[1]);
+                mBackground.setAlpha(alpha);
                 mBackground.setBounds(mScrollX, offset, mScrollX + getMeasuredWidth(),
                         offset + getMeasuredHeight());
                 mBackground.draw(canvas);
+            } else {
+                mBackground.setAlpha(alpha);
+                mBackground.setBounds(mScrollX, 0, mScrollX + getMeasuredWidth(),
+                        getMeasuredHeight());
+                mBackground.draw(canvas);
             }
         }
         super.onDraw(canvas);