Resource cleanup: Removing obsolete resources

> For workspace scrim, using a flat color, instead of a 1-pixel bitmap

Change-Id: I7e8a16293b90303b0674d7f678c3f4cc5fb8a962

diff --git a/res/drawable-hdpi/apps_customize_bg.png b/res/drawable-hdpi/apps_customize_bg.png
deleted file mode 100644 (file)
index 2847467..0000000
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 (file)
index ef07011..0000000
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 (file)
index 1dc02d5..0000000
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 (file)
index 852a0cb..0000000
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 (file)
index 5b47f44..0000000
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 (file)
index ba8a4a8..0000000
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 (file)
index 2847467..0000000
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 (file)
index 679a1f6..0000000
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 (file)
index 84fa594..0000000
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 (file)
index 1d12e83..0000000
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 (file)
index 647b60f..0000000
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 (file)
index 1e4afae..0000000
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 (file)
index a51cc11..0000000
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 (file)
index d9abfd3..0000000
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 (file)
index 81228d4..0000000
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 (file)
index 8c101e0..0000000
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 (file)
index fb8a228..0000000
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 (file)
index cedbdc4..0000000
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 (file)
index a51cc11..0000000
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 (file)
index b64f4d0..0000000
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 (file)
index 0f62097..0000000
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 (file)
index 8a77536..0000000
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 (file)
index dd2216f..0000000
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 (file)
index 0b8e88c..0000000
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 (file)
index a47b2ba..0000000
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 (file)
index 75625d1..0000000
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 (file)
index 800d994..0000000
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 (file)
index 27a5897..0000000
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 (file)
index 25ea9fa..0000000
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 (file)
index 33a8d2d..0000000
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 (file)
index 599a076..0000000
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 (file)
index 7b11dea..0000000
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 2efdb06..8ba25da 100644 (file)
--- 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);