diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-27 10:05:28 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-06-19 19:53:34 +0000 |
commit | 4d113a5ff44ff1a7f19263bde21581fbf9a54212 (patch) | |
tree | d80c55262936ed1c4ebd265fcf72adfad095a859 /src/com/android/launcher3/CellLayout.java | |
parent | e91a14c6986660253996018982d500a728585199 (diff) | |
download | android_packages_apps_Trebuchet-4d113a5ff44ff1a7f19263bde21581fbf9a54212.tar.gz android_packages_apps_Trebuchet-4d113a5ff44ff1a7f19263bde21581fbf9a54212.tar.bz2 android_packages_apps_Trebuchet-4d113a5ff44ff1a7f19263bde21581fbf9a54212.zip |
Using material style overscroll effect for workspace and folders
Bug: 21335369
Change-Id: I53cc6edfa87334b9326f1dedd90c3e2222beade5
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r-- | src/com/android/launcher3/CellLayout.java | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index b5d0dca24..2cde3d53d 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -100,17 +100,11 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { private ArrayList<FolderRingAnimator> mFolderOuterRings = new ArrayList<FolderRingAnimator>(); private int[] mFolderLeaveBehindCell = {-1, -1}; - private static final float FOREGROUND_ALPHA_DAMPER = 0.65f; - private int mForegroundAlpha = 0; private float mBackgroundAlpha; private static final int BACKGROUND_ACTIVATE_DURATION = 120; private final TransitionDrawable mBackground; - private final Drawable mOverScrollLeft; - private final Drawable mOverScrollRight; - private Drawable mOverScrollForegroundDrawable; - // These values allow a fixed measurement to be set on the CellLayout. private int mFixedWidth = -1; private int mFixedHeight = -1; @@ -218,9 +212,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { mBackground = (TransitionDrawable) res.getDrawable(R.drawable.bg_screenpanel); mBackground.setCallback(this); - mOverScrollLeft = res.getDrawable(R.drawable.overscroll_glow_left); - mOverScrollRight = res.getDrawable(R.drawable.overscroll_glow_right); - mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * grid.iconSizePx); @@ -396,19 +387,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { return mDropPending; } - void setOverScrollAmount(float r, boolean left) { - if (left && mOverScrollForegroundDrawable != mOverScrollLeft) { - mOverScrollForegroundDrawable = mOverScrollLeft; - } else if (!left && mOverScrollForegroundDrawable != mOverScrollRight) { - mOverScrollForegroundDrawable = mOverScrollRight; - } - - r *= FOREGROUND_ALPHA_DAMPER; - mForegroundAlpha = (int) Math.round((r * 255)); - mOverScrollForegroundDrawable.setAlpha(mForegroundAlpha); - invalidate(); - } - @Override public void setPressedIcon(BubbleTextView icon, Bitmap background) { if (icon == null || background == null) { @@ -553,14 +531,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { } } - @Override - protected void dispatchDraw(Canvas canvas) { - super.dispatchDraw(canvas); - if (mForegroundAlpha > 0) { - mOverScrollForegroundDrawable.draw(canvas); - } - } - public void showFolderAccept(FolderRingAnimator fra) { mFolderOuterRings.add(fra); } @@ -920,9 +890,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { mBackground.getPadding(mTempRect); mBackground.setBounds(-mTempRect.left, -mTempRect.top, w + mTempRect.right, h + mTempRect.bottom); - - mOverScrollLeft.setBounds(0, 0, w, h); - mOverScrollRight.setBounds(0, 0, w, h); } @Override |