aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 17:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Updating portals visuals:"

Browse Source
This commit is contained in:
Adam Cohen
2011-07-27 11:58:22 -07:00
committed by Android (Google) Code Review
parent d2eca6b66e c51934bfdf
commit 041b0c09c4
16 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/launcher2/FolderIcon.java
View File

@@ -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) {