Reodering some drawables

  > quantum_panel_shape is xml rectangle with no margin
  > quantum_panel_bitmap is 9-patch drawable with inbuild shadow and margin
  > quantum_panel uses xml-shape for lollipop and 9-patch image for lower
    devices. It includes margin. For shadow, use elevation on lollipop
  > All drawables have _dark variant
  > Using #f5f5f5 for panel background, instead of #ffffff

Change-Id: Ia7c6cea6d514ee3774fcf5fef6139650bdd53208

2 files changed, 4 insertions, 12 deletions

diff --git a/src/com/android/launcher3/AppsContainerView.java b/src/com/android/launcher3/AppsContainerView.java
index 989026e36..a74670be0 100644
--- a/src/com/android/launcher3/AppsContainerView.java
+++ b/src/com/android/launcher3/AppsContainerView.java
@@ -35,6 +35,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+
 import com.android.launcher3.util.Thunk;
 
 import java.util.List;
@@ -380,12 +381,13 @@ public class AppsContainerView extends BaseContainerView implements DragSource,
 
         // Update the background of the reveal view and list to be inset with the fixed bound
         // insets instead of the default insets
+        // TODO: Use quantum_panel instead of quantum_panel_shape.
         mAppsRecyclerView.setBackground(new InsetDrawable(
                 getContext().getResources().getDrawable(
-                        hasSearchBar ? R.drawable.apps_list_search_bg : R.drawable.apps_list_bg),
+                        hasSearchBar ? R.drawable.apps_list_search_bg : R.drawable.quantum_panel_shape),
                 inset, 0, inset, 0));
         getRevealView().setBackground(new InsetDrawable(
-                getContext().getResources().getDrawable(R.drawable.apps_reveal_bg),
+                getContext().getResources().getDrawable(R.drawable.quantum_panel_shape),
                 inset, 0, inset, 0));
     }
 
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 377e8eeff..6e5941cf2 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -27,7 +27,6 @@ import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.Rect;
-import android.graphics.drawable.InsetDrawable;
 import android.os.Build;
 import android.text.InputType;
 import android.text.Selection;
@@ -183,15 +182,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         // name is complete, we have something to focus on, thus hiding the cursor and giving
         // reliable behavior when clicking the text field (since it will always gain focus on click).
         setFocusableInTouchMode(true);
-
-        if (Utilities.isLmpOrAbove()) {
-            int padding = getResources().getDimensionPixelSize(R.dimen.folder_shadow_padding);
-            setBackground(new InsetDrawable(
-                    getResources().getDrawable(R.drawable.apps_list_bg),
-                    padding, padding, padding, padding));
-        } else {
-            setBackgroundResource(R.drawable.quantum_panel);
-        }
     }
 
     @Override