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 | |
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')
-rw-r--r-- | src/com/android/launcher2/CellLayout.java | 29 | ||||
-rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 9 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 21 | ||||
-rw-r--r-- | src/com/android/launcher2/LauncherSettings.java | 2 |
4 files changed, 59 insertions, 2 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 65ca16270..518c79fc2 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -85,6 +85,7 @@ public class CellLayout extends ViewGroup { private OnTouchListener mInterceptTouchListener; private ArrayList<FolderRingAnimator> mFolderOuterRings = new ArrayList<FolderRingAnimator>(); + private int[] mFolderLeaveBehindCell = {-1, -1}; private float mBackgroundAlpha; private float mBackgroundAlphaMultiplier = 1.0f; @@ -557,6 +558,22 @@ public class CellLayout extends ViewGroup { d.draw(canvas); canvas.restore(); } + + if (mFolderLeaveBehindCell[0] >= 0 && mFolderLeaveBehindCell[1] >= 0) { + Drawable d = FolderIcon.sSharedFolderLeaveBehind; + int width = d.getIntrinsicWidth(); + int height = d.getIntrinsicHeight(); + + cellToPoint(mFolderLeaveBehindCell[0], mFolderLeaveBehindCell[1], mTempLocation); + int centerX = mTempLocation[0] + mCellWidth / 2; + int centerY = mTempLocation[1] + FolderRingAnimator.sPreviewSize / 2; + + canvas.save(); + canvas.translate(centerX - width / 2, centerY - width / 2); + d.setBounds(0, 0, width, height); + d.draw(canvas); + canvas.restore(); + } } public void showFolderAccept(FolderRingAnimator fra) { @@ -570,6 +587,18 @@ public class CellLayout extends ViewGroup { invalidate(); } + public void setFolderLeaveBehindCell(int x, int y) { + mFolderLeaveBehindCell[0] = x; + mFolderLeaveBehindCell[1] = y; + invalidate(); + } + + public void clearFolderLeaveBehind() { + mFolderLeaveBehindCell[0] = -1; + mFolderLeaveBehindCell[1] = -1; + invalidate(); + } + @Override public void cancelLongPress() { super.cancelLongPress(); 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) { diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index bc341ef81..0f302a012 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1754,6 +1754,12 @@ public final class Launcher extends Activity PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", 1.5f); PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", 1.5f); + FolderInfo info = (FolderInfo) fi.getTag(); + if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { + CellLayout cl = (CellLayout) fi.getParent().getParent(); + cl.setFolderLeaveBehindCell(info.cellX, info.cellY); + } + ObjectAnimator oa = ObjectAnimator.ofPropertyValuesHolder(fi, alpha, scaleX, scaleY); oa.setDuration(getResources().getInteger(R.integer.config_folderAnimDuration)); oa.start(); @@ -1764,8 +1770,23 @@ public final class Launcher extends Activity PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", 1.0f); PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", 1.0f); + FolderInfo info = (FolderInfo) fi.getTag(); + CellLayout cl = null; + if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { + cl = (CellLayout) fi.getParent().getParent(); + } + + final CellLayout layout = cl; ObjectAnimator oa = ObjectAnimator.ofPropertyValuesHolder(fi, alpha, scaleX, scaleY); oa.setDuration(getResources().getInteger(R.integer.config_folderAnimDuration)); + oa.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + if (layout != null) { + layout.clearFolderLeaveBehind(); + } + } + }); oa.start(); } diff --git a/src/com/android/launcher2/LauncherSettings.java b/src/com/android/launcher2/LauncherSettings.java index fcacdec5f..ee003716b 100644 --- a/src/com/android/launcher2/LauncherSettings.java +++ b/src/com/android/launcher2/LauncherSettings.java @@ -143,7 +143,7 @@ class LauncherSettings { /** * The X coordinate of the cell holding the favorite - * (if container is CONTAINER_DESKTOP or CONTAINER_DOCK) + * (if container is CONTAINER_HOTSEAT or CONTAINER_HOTSEAT) * <P>Type: INTEGER</P> */ static final String CELLX = "cellX"; |