diff --git a/res/drawable-hdpi/apps_customize_bg.png b/res/drawable-hdpi/apps_customize_bg.png deleted file mode 100644 index 284746796c..0000000000 Binary files a/res/drawable-hdpi/apps_customize_bg.png and /dev/null differ diff --git a/res/drawable-hdpi/home_press.9.png b/res/drawable-hdpi/home_press.9.png deleted file mode 100644 index ef07011f82..0000000000 Binary files a/res/drawable-hdpi/home_press.9.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png deleted file mode 100644 index 1dc02d5e41..0000000000 Binary files a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/on_boarding_welcome.png b/res/drawable-hdpi/on_boarding_welcome.png deleted file mode 100644 index 852a0cb132..0000000000 Binary files a/res/drawable-hdpi/on_boarding_welcome.png and /dev/null differ diff --git a/res/drawable-hdpi/paged_view_indicator.9.png b/res/drawable-hdpi/paged_view_indicator.9.png deleted file mode 100644 index 5b47f44771..0000000000 Binary files a/res/drawable-hdpi/paged_view_indicator.9.png and /dev/null differ diff --git a/res/drawable-hdpi/portal_container_holo.9.png b/res/drawable-hdpi/portal_container_holo.9.png deleted file mode 100644 index ba8a4a8cd0..0000000000 Binary files a/res/drawable-hdpi/portal_container_holo.9.png and /dev/null differ diff --git a/res/drawable-mdpi/apps_customize_bg.png b/res/drawable-mdpi/apps_customize_bg.png deleted file mode 100644 index 284746796c..0000000000 Binary files a/res/drawable-mdpi/apps_customize_bg.png and /dev/null differ diff --git a/res/drawable-mdpi/home_press.9.png b/res/drawable-mdpi/home_press.9.png deleted file mode 100644 index 679a1f6269..0000000000 Binary files a/res/drawable-mdpi/home_press.9.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png deleted file mode 100644 index 84fa5947da..0000000000 Binary files a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/on_boarding_welcome.png b/res/drawable-mdpi/on_boarding_welcome.png deleted file mode 100644 index 1d12e83621..0000000000 Binary files a/res/drawable-mdpi/on_boarding_welcome.png and /dev/null differ diff --git a/res/drawable-mdpi/paged_view_indicator.9.png b/res/drawable-mdpi/paged_view_indicator.9.png deleted file mode 100644 index 647b60f376..0000000000 Binary files a/res/drawable-mdpi/paged_view_indicator.9.png and /dev/null differ diff --git a/res/drawable-mdpi/portal_container_holo.9.png b/res/drawable-mdpi/portal_container_holo.9.png deleted file mode 100644 index 1e4afae764..0000000000 Binary files a/res/drawable-mdpi/portal_container_holo.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/apps_customize_bg.png b/res/drawable-xhdpi/apps_customize_bg.png deleted file mode 100644 index a51cc112b6..0000000000 Binary files a/res/drawable-xhdpi/apps_customize_bg.png and /dev/null differ diff --git a/res/drawable-xhdpi/home_press.9.png b/res/drawable-xhdpi/home_press.9.png deleted file mode 100644 index d9abfd358d..0000000000 Binary files a/res/drawable-xhdpi/home_press.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png deleted file mode 100644 index 81228d4028..0000000000 Binary files a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/on_boarding_welcome.png b/res/drawable-xhdpi/on_boarding_welcome.png deleted file mode 100644 index 8c101e0dbf..0000000000 Binary files a/res/drawable-xhdpi/on_boarding_welcome.png and /dev/null differ diff --git a/res/drawable-xhdpi/paged_view_indicator.9.png b/res/drawable-xhdpi/paged_view_indicator.9.png deleted file mode 100644 index fb8a228203..0000000000 Binary files a/res/drawable-xhdpi/paged_view_indicator.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/portal_container_holo.9.png b/res/drawable-xhdpi/portal_container_holo.9.png deleted file mode 100644 index cedbdc401e..0000000000 Binary files a/res/drawable-xhdpi/portal_container_holo.9.png and /dev/null differ diff --git a/res/drawable-xxhdpi/apps_customize_bg.png b/res/drawable-xxhdpi/apps_customize_bg.png deleted file mode 100644 index a51cc112b6..0000000000 Binary files a/res/drawable-xxhdpi/apps_customize_bg.png and /dev/null differ diff --git a/res/drawable-xxhdpi/arrow_dashed.png b/res/drawable-xxhdpi/arrow_dashed.png deleted file mode 100644 index b64f4d0fef..0000000000 Binary files a/res/drawable-xxhdpi/arrow_dashed.png and /dev/null differ diff --git a/res/drawable-xxhdpi/default_widget_preview_holo.9.png b/res/drawable-xxhdpi/default_widget_preview_holo.9.png deleted file mode 100644 index 0f62097a81..0000000000 Binary files a/res/drawable-xxhdpi/default_widget_preview_holo.9.png and /dev/null differ diff --git a/res/drawable-xxhdpi/hotseat_scrubber_holo.9.png b/res/drawable-xxhdpi/hotseat_scrubber_holo.9.png deleted file mode 100644 index 8a77536beb..0000000000 Binary files a/res/drawable-xxhdpi/hotseat_scrubber_holo.9.png and /dev/null differ diff --git a/res/drawable-xxhdpi/hotseat_track_holo.9.png b/res/drawable-xxhdpi/hotseat_track_holo.9.png deleted file mode 100644 index dd2216fb71..0000000000 Binary files a/res/drawable-xxhdpi/hotseat_track_holo.9.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xxhdpi/ic_home_all_apps_holo_dark.png deleted file mode 100644 index 0b8e88c169..0000000000 Binary files a/res/drawable-xxhdpi/ic_home_all_apps_holo_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_home_google_logo_normal_holo.png b/res/drawable-xxhdpi/ic_home_google_logo_normal_holo.png deleted file mode 100644 index a47b2ba990..0000000000 Binary files a/res/drawable-xxhdpi/ic_home_google_logo_normal_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_home_google_logo_pressed_holo.png b/res/drawable-xxhdpi/ic_home_google_logo_pressed_holo.png deleted file mode 100644 index 75625d120b..0000000000 Binary files a/res/drawable-xxhdpi/ic_home_google_logo_pressed_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_home_search_pressed_holo.png b/res/drawable-xxhdpi/ic_home_search_pressed_holo.png deleted file mode 100644 index 800d99430c..0000000000 Binary files a/res/drawable-xxhdpi/ic_home_search_pressed_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_home_voice_search_pressed_holo.png b/res/drawable-xxhdpi/ic_home_voice_search_pressed_holo.png deleted file mode 100644 index 27a5897823..0000000000 Binary files a/res/drawable-xxhdpi/ic_home_voice_search_pressed_holo.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_qs_remote_display.png b/res/drawable-xxhdpi/ic_qs_remote_display.png deleted file mode 100644 index 25ea9fab22..0000000000 Binary files a/res/drawable-xxhdpi/ic_qs_remote_display.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_qs_remote_display_connected.png b/res/drawable-xxhdpi/ic_qs_remote_display_connected.png deleted file mode 100644 index 33a8d2d5ad..0000000000 Binary files a/res/drawable-xxhdpi/ic_qs_remote_display_connected.png and /dev/null differ diff --git a/res/drawable-xxhdpi/portal_container_holo.9.png b/res/drawable-xxhdpi/portal_container_holo.9.png deleted file mode 100644 index 599a076d8b..0000000000 Binary files a/res/drawable-xxhdpi/portal_container_holo.9.png and /dev/null differ diff --git a/res/mipmap-xxhdpi/on_boarding_welcome.png b/res/mipmap-xxhdpi/on_boarding_welcome.png deleted file mode 100644 index 7b11dea0e0..0000000000 Binary files a/res/mipmap-xxhdpi/on_boarding_welcome.png and /dev/null differ diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 2efdb06b9e..8ba25da697 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);