commit 54c725cc294cd43ed0650179bfae64a622547660
author Winson Chung <winsonc@google.com> Wed Aug 03 12:03:40 2011 -0700
committer Winson Chung <winsonc@google.com> Wed Aug 03 14:29:19 2011 -0700
tree d90016ff4cdbfaba7ab16d77b1039ae364d7e3db
parent aaf473c2bb6329b3b09ed2e19de6aae26077050c

Bug fixes

- Fixing issue where drop target is not as tall as it should be (5116098)
- Fixing issue where number of cells was being computed incorrectly (5112002)
- Disabling side page fading in AppsCustomize on the phone UI
- Should be using action bar bg states instead of tab bg states (5086625)

Change-Id: I0ec927f87cede48dcf4b66cbaa1d62a09f3492b8

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index e5fe7bd..53d154f 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -228,6 +228,7 @@
         // (top + bottom)
         mWidgetPreviewIconPaddedDimension =
             (int) (mAppIconSize * (1 + (2 * sWidgetPreviewIconPaddingPercentage)));
+        mFadeInAdjacentScreens = LauncherApplication.isScreenLarge();
     }
 
     @Override
@@ -567,7 +568,9 @@
         layout.allowHardwareLayerCreation();
         layout.createHardwareLayers();
 
-        prepareGenerateHoloOutlinesTask(page, items, images);
+        if (mFadeInAdjacentScreens) {
+            prepareGenerateHoloOutlinesTask(page, items, images);
+        }
     }
 
     /**
@@ -929,7 +932,10 @@
 
         invalidate();
         forceUpdateAdjacentPagesAlpha();
-        prepareGenerateHoloOutlinesTask(data.page, data.items, data.generatedImages);
+
+        if (mFadeInAdjacentScreens) {
+            prepareGenerateHoloOutlinesTask(data.page, data.items, data.generatedImages);
+        }
     }
     private void onHolographicPageItemsLoaded(AsyncTaskPageData data) {
         // Invalidate early to short-circuit children invalidates