diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-07-27 11:58:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-27 11:58:22 -0700 |
| commit | 041b0c09c400dbbde2fb2bd0a2072ed19fb3e99d (patch) | |
| tree | 365ca6ace2e7001fc88d4b8ed76d4a14e485d15f /src/com/android/launcher2/FolderIcon.java | |
| parent | d2eca6b66e654e71fb46ae718910af3ec6c2cf9c (diff) | |
| parent | c51934bfdfed6a5011c6d6c5b7b70f2d75613d41 (diff) | |
| download | android_packages_apps_Trebuchet-041b0c09c400dbbde2fb2bd0a2072ed19fb3e99d.tar.gz android_packages_apps_Trebuchet-041b0c09c400dbbde2fb2bd0a2072ed19fb3e99d.tar.bz2 android_packages_apps_Trebuchet-041b0c09c400dbbde2fb2bd0a2072ed19fb3e99d.zip | |
Merge "Updating portals visuals:"
Diffstat (limited to 'src/com/android/launcher2/FolderIcon.java')
| -rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index 07ae5b8e2..8cf3fa7d1 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -71,6 +71,8 @@ public class FolderIcon extends LinearLayout implements FolderListener { // (0 means it's not scaled at all, 1 means it's scaled to nothing) private static final float PERSPECTIVE_SCALE_FACTOR = 0.35f; + public static Drawable sSharedFolderLeaveBehind = null; + private ImageView mPreviewBackground; private BubbleTextView mFolderName; @@ -135,6 +137,11 @@ public class FolderIcon extends LinearLayout implements FolderListener { folderInfo.addListener(icon); + Resources res = launcher.getResources(); + if (sSharedFolderLeaveBehind == null) { + sSharedFolderLeaveBehind = res.getDrawable(R.drawable.portal_ring_rest); + } + return icon; } @@ -259,7 +266,7 @@ public class FolderIcon extends LinearLayout implements FolderListener { final int itemType = item.itemType; return ((itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION || itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) && - !mFolder.isFull() && item != mInfo); + !mFolder.isFull() && item != mInfo && !mInfo.opened); } public boolean acceptDrop(Object dragInfo) { |