commit e763ad1d1427977cfac494fc62cc637a69b91755
author Michael Jurka <mikejurka@google.com> Thu Sep 12 22:14:50 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 12 22:14:50 2013 +0000
tree 7e569dd9108f093201d94b2093ffa305fead30ee
parent d5066bebd896d4d060fa9d76d9d214b9e130c12d
parent be2f8ddd8067d0da71e2d03e42bcad17f9430439

Merge "Adding persistence of saved wallpaper images" into jb-ub-now-indigo-rose

proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 7397088..806105f 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -14,12 +14,6 @@
 -keep class com.android.launcher3.CellLayout {
   public float getBackgroundAlpha();
   public void setBackgroundAlpha(float);
-  public float getDimmableProgress();
-  public void setDimmableProgress(float);
-  public float getHoverScale();
-  public void setHoverScale(float);
-  public float getHoverAlpha();
-  public void setHoverAlpha(float);
 }
 
 -keep class com.android.launcher3.DragLayer$LayoutParams {
@@ -49,18 +43,6 @@
   public void setBackgroundAlpha(float);
   public float getChildrenOutlineAlpha();
   public void setChildrenOutlineAlpha(float);
-  public void setVerticalWallpaperOffset(float);
-  public float getVerticalWallpaperOffset();
-  public void setHorizontalWallpaperOffset(float);
-  public float getHorizontalWallpaperOffset();
-}
-
--keep class com.android.launcher3.AllApps3D$Defines {
-  *;
-}
-
--keep class com.android.launcher3.ClippedImageView {
-  *;
 }
 
 -keep class com.android.launcher3.MemoryDumpActivity {

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 0a0452d..682c2ed 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -947,9 +947,11 @@
         int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
         int widthSize = MeasureSpec.getSize(widthMeasureSpec);
         int heightSize =  MeasureSpec.getSize(heightMeasureSpec);
-        if (mCellWidth < 0 || mCellHeight < 0) {
-            mCellWidth = grid.calculateCellWidth(widthSize, mCountX);
-            mCellHeight = grid.calculateCellHeight(heightSize, mCountY);
+        int cw = grid.calculateCellWidth(widthSize, mCountX);
+        int ch = grid.calculateCellHeight(heightSize, mCountY);
+        if (cw != mCellWidth || ch != mCellHeight) {
+            mCellWidth = cw;
+            mCellHeight = ch;
             mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mWidthGap,
                     mHeightGap, mCountX, mCountY);
         }

src/com/android/launcher3/DeleteDropTarget.java

diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 05d6dc4..dce18fe 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -145,6 +145,13 @@
                     item.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) {
                 return true;
             }
+
+            if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
+                    (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER ||
+                    item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION)) {
+                return true;
+            }
+
             if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
                 item instanceof ShortcutInfo) {
                 if (AppsCustomizePagedView.DISABLE_ALL_APPS) {