diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-13 11:23:24 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-13 11:24:18 -0700 |
commit | 0fa93bc5c65a2d7d5e5f4e798499903759c48cc5 (patch) | |
tree | f3dc234f4bef7ecb2364cb9572b319e314cbb816 /src/com/android/launcher3 | |
parent | 8a496ac99e6418c6e05fc8cc6f2c72bdf7c125d5 (diff) | |
download | android_packages_apps_Trebuchet-0fa93bc5c65a2d7d5e5f4e798499903759c48cc5.tar.gz android_packages_apps_Trebuchet-0fa93bc5c65a2d7d5e5f4e798499903759c48cc5.tar.bz2 android_packages_apps_Trebuchet-0fa93bc5c65a2d7d5e5f4e798499903759c48cc5.zip |
Resource cleanup: Removing obsolete resources
> For workspace scrim, using a flat color, instead of a 1-pixel bitmap
Change-Id: I7e8a16293b90303b0674d7f678c3f4cc5fb8a962
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/DragLayer.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 2efdb06b9..8ba25da69 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -24,6 +24,7 @@ import android.animation.ValueAnimator.AnimatorUpdateListener; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; +import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; @@ -46,6 +47,10 @@ import java.util.ArrayList; * A ViewGroup that coordinates dragging across its descendants */ public class DragLayer extends InsettableFrameLayout { + + // Scrim color without any alpha component. + private static final int SCRIM_COLOR = Color.BLACK & 0x00FFFFFF; + @Thunk DragController mDragController; private int[] mTmpXY = new int[2]; @@ -78,7 +83,6 @@ public class DragLayer extends InsettableFrameLayout { private int mChildCountOnLastUpdate = -1; // Darkening scrim - private Drawable mBackground; private float mBackgroundAlpha = 0; // Related to adjacent page hints @@ -109,7 +113,6 @@ public class DragLayer extends InsettableFrameLayout { mRightHoverDrawable = res.getDrawable(R.drawable.page_hover_right); mLeftHoverDrawableActive = res.getDrawable(R.drawable.page_hover_left_active); mRightHoverDrawableActive = res.getDrawable(R.drawable.page_hover_right_active); - mBackground = res.getDrawable(R.drawable.apps_customize_bg); } public void setup(Launcher launcher, DragController controller) { @@ -926,12 +929,10 @@ public class DragLayer extends InsettableFrameLayout { @Override protected void dispatchDraw(Canvas canvas) { - // Draw the background gradient below children. - if (mBackground != null && mBackgroundAlpha > 0.0f) { + // Draw the background below children. + if (mBackgroundAlpha > 0.0f) { int alpha = (int) (mBackgroundAlpha * 255); - mBackground.setAlpha(alpha); - mBackground.setBounds(0, 0, getMeasuredWidth(), getMeasuredHeight()); - mBackground.draw(canvas); + canvas.drawColor((alpha << 24) | SCRIM_COLOR); } super.dispatchDraw(canvas); |