diff options
author | Adam Cohen <adamcohen@google.com> | 2011-11-09 17:20:41 -0800 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-11-11 11:38:53 -0800 |
commit | ebea84d1c95f4c38ba8cee46cd586fd757b4fce2 (patch) | |
tree | 6278e0e16611db2a59bfd5a481636e0efee9bb0f /src/com/android/launcher2/CellLayout.java | |
parent | 31234d811dc69c159757a6890852eb0f53d559a9 (diff) | |
download | android_packages_apps_Trebuchet-ebea84d1c95f4c38ba8cee46cd586fd757b4fce2.tar.gz android_packages_apps_Trebuchet-ebea84d1c95f4c38ba8cee46cd586fd757b4fce2.tar.bz2 android_packages_apps_Trebuchet-ebea84d1c95f4c38ba8cee46cd586fd757b4fce2.zip |
Unifying overscroll btw phone and tablet
-> Using separate assets for removing and uninstalling
Change-Id: I183967c3ca482531ae28f71cd9053b673c6a8d03
Diffstat (limited to 'src/com/android/launcher2/CellLayout.java')
-rw-r--r-- | src/com/android/launcher2/CellLayout.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java index 2d7549386..6e6028077 100644 --- a/src/com/android/launcher2/CellLayout.java +++ b/src/com/android/launcher2/CellLayout.java @@ -36,7 +36,6 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.graphics.RectF; -import android.graphics.Region; import android.graphics.drawable.Drawable; import android.graphics.drawable.NinePatchDrawable; import android.util.AttributeSet; @@ -72,6 +71,7 @@ public class CellLayout extends ViewGroup { private int mWidthGap; private int mHeightGap; private int mMaxGap; + private boolean mScrollingTransformsDirty = false; private final Rect mRect = new Rect(); private final CellInfo mCellInfo = new CellInfo(); @@ -345,6 +345,23 @@ public class CellLayout extends ViewGroup { return mIsDragOverlapping; } + protected void setOverscrollTransformsDirty(boolean dirty) { + mScrollingTransformsDirty = dirty; + } + + protected void resetOverscrollTransforms() { + if (mScrollingTransformsDirty) { + setOverscrollTransformsDirty(false); + setTranslationX(0); + setRotationY(0); + // It doesn't matter if we pass true or false here, the important thing is that we + // pass 0, which results in the overscroll drawable not being drawn any more. + setOverScrollAmount(0, false); + setPivotX(getMeasuredWidth() / 2); + setPivotY(getMeasuredHeight() / 2); + } + } + @Override protected void onDraw(Canvas canvas) { // When we're large, we are either drawn in a "hover" state (ie when dragging an item to |