diff options
-rw-r--r-- | res/drawable-v24/ic_info_shadow.xml | 3 | ||||
-rw-r--r-- | res/drawable-v24/ic_remove_shadow.xml | 3 | ||||
-rw-r--r-- | res/drawable-v24/ic_uninstall_shadow.xml | 3 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/graphics/ShadowDrawable.java | 15 |
6 files changed, 11 insertions, 16 deletions
diff --git a/res/drawable-v24/ic_info_shadow.xml b/res/drawable-v24/ic_info_shadow.xml index 9bd7e16d0..1fe2c46b4 100644 --- a/res/drawable-v24/ic_info_shadow.xml +++ b/res/drawable-v24/ic_info_shadow.xml @@ -15,4 +15,5 @@ --> <com.android.launcher3.graphics.ShadowDrawable xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_info_no_shadow" /> + android:src="@drawable/ic_info_no_shadow" + android:elevation="@dimen/drop_target_shadow_elevation" /> diff --git a/res/drawable-v24/ic_remove_shadow.xml b/res/drawable-v24/ic_remove_shadow.xml index 16a630e5f..48abc10b3 100644 --- a/res/drawable-v24/ic_remove_shadow.xml +++ b/res/drawable-v24/ic_remove_shadow.xml @@ -15,4 +15,5 @@ --> <com.android.launcher3.graphics.ShadowDrawable xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_remove_no_shadow" /> + android:src="@drawable/ic_remove_no_shadow" + android:elevation="@dimen/drop_target_shadow_elevation" /> diff --git a/res/drawable-v24/ic_uninstall_shadow.xml b/res/drawable-v24/ic_uninstall_shadow.xml index 2532157ab..b441b0e7b 100644 --- a/res/drawable-v24/ic_uninstall_shadow.xml +++ b/res/drawable-v24/ic_uninstall_shadow.xml @@ -15,4 +15,5 @@ --> <com.android.launcher3.graphics.ShadowDrawable xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_uninstall_no_shadow" /> + android:src="@drawable/ic_uninstall_no_shadow" + android:elevation="@dimen/drop_target_shadow_elevation" /> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 18759f817..807d08af2 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -114,5 +114,6 @@ <declare-styleable name="ShadowDrawable"> <attr name="android:src" /> <attr name="android:shadowColor" /> + <attr name="android:elevation" /> </declare-styleable> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b0f64a604..958cb6bc8 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -104,6 +104,7 @@ <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">14dp</dimen> <dimen name="drop_target_text_size">14sp</dimen> + <dimen name="drop_target_shadow_elevation">2dp</dimen> <!-- the distance an icon must be dragged before button drop targets accept it --> <dimen name="drag_distanceThreshold">30dp</dimen> @@ -138,7 +139,6 @@ <dimen name="blur_size_medium_outline">2dp</dimen> <dimen name="blur_size_click_shadow">4dp</dimen> <dimen name="click_shadow_high_shift">2dp</dimen> - <dimen name="drawable_shadow_size">4dp</dimen> <!-- Pending widget --> <dimen name="pending_widget_min_padding">8dp</dimen> diff --git a/src/com/android/launcher3/graphics/ShadowDrawable.java b/src/com/android/launcher3/graphics/ShadowDrawable.java index 5e76649ca..5f4fc6cc7 100644 --- a/src/com/android/launcher3/graphics/ShadowDrawable.java +++ b/src/com/android/launcher3/graphics/ShadowDrawable.java @@ -46,6 +46,7 @@ public class ShadowDrawable extends Drawable { private final ShadowDrawableState mState; + @SuppressWarnings("unused") public ShadowDrawable() { this(new ShadowDrawableState()); } @@ -98,17 +99,6 @@ public class ShadowDrawable extends Drawable { return mState.mIntrinsicWidth; } - /** - * Sets the color for the generated shadow - */ - public void setShadowColor(int color) { - if (mState.mShadowColor != color) { - mState.mShadowColor = color; - mState.mLastDrawnBitmap = null; - invalidateSelf(); - } - } - private void regenerateBitmapCache() { Bitmap bitmap = Bitmap.createBitmap(mState.mIntrinsicWidth, mState.mIntrinsicHeight, Bitmap.Config.ARGB_8888); @@ -154,7 +144,8 @@ public class ShadowDrawable extends Drawable { } mState.mShadowColor = a.getColor( R.styleable.ShadowDrawable_android_shadowColor, Color.BLACK); - mState.mShadowSize = r.getDimensionPixelSize(R.dimen.drawable_shadow_size); + mState.mShadowSize = a.getDimensionPixelSize( + R.styleable.ShadowDrawable_android_elevation, 0); mState.mIntrinsicHeight = d.getIntrinsicHeight() + 2 * mState.mShadowSize; mState.mIntrinsicWidth = d.getIntrinsicWidth() + 2 * mState.mShadowSize; |