commit a3a6f51b12b30591301efce0211c51bb47a8deaa
author Yogisha Dixit <ydixit@google.com> Wed Apr 28 13:45:37 2021 +0100
committer Yogisha Dixit <ydixit@google.com> Thu Apr 29 09:18:05 2021 +0000
tree 5b522088fc3bac538be6951ec1506f89ff73b332
parent 5354abb0e77ca537ac6a44d9e962292230b85920

Update drop target styling based for BC.

Spec: https://docs.google.com/presentation/d/1UxdDh8EFhPbdRWRwzjbpgL-j02ew4Ew3eG3XBCeoYdo/edit#slide=id.vXfwHn8

Demo: https://drive.google.com/file/d/1ZIa3Dgo85vdVkfPm7aGJDyctZQR_c8Xx/view?usp=sharing

Test: manual
Bug: 184713740
Change-Id: I17dbbf1f7bbc40939cfc0fedb506a35f39ecc2e3

src/com/android/launcher3/ButtonDropTarget.java

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index a26217c..00317f7 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -36,6 +36,8 @@
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+import androidx.appcompat.content.res.AppCompatResources;
+
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.dragndrop.DragController;
 import com.android.launcher3.dragndrop.DragLayer;
@@ -142,6 +144,11 @@
         }
     }
 
+    private void setBackgroundDrawable(int resId) {
+        Drawable bd = AppCompatResources.getDrawable(getContext(), resId);
+        setBackground(bd);
+    }
+
     @Override
     public final void onDragEnter(DragObject d) {
         if (!mAccessibleDrag && !mTextVisible) {
@@ -167,6 +174,7 @@
         }
 
         d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
+        setBackgroundDrawable(R.drawable.drop_target_frame_hover);
         if (d.stateAnnouncer != null) {
             d.stateAnnouncer.cancel();
         }
@@ -184,6 +192,7 @@
 
         if (!d.dragComplete) {
             d.dragView.setAlpha(1f);
+            setBackgroundDrawable(R.drawable.drop_target_frame);
         } else {
             d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
         }

src/com/android/launcher3/DeleteDropTarget.java

diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index e46aad2..80ec192 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -53,7 +53,7 @@
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        setDrawable(R.drawable.ic_remove_shadow);
+        setDrawable(R.drawable.ic_remove_no_shadow);
     }
 
     @Override

src/com/android/launcher3/SecondaryDropTarget.java

diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java
index 858b72e..05cef38 100644
--- a/src/com/android/launcher3/SecondaryDropTarget.java
+++ b/src/com/android/launcher3/SecondaryDropTarget.java
@@ -108,13 +108,13 @@
         mCurrentAccessibilityAction = action;
 
         if (action == UNINSTALL) {
-            setDrawable(R.drawable.ic_uninstall_shadow);
+            setDrawable(R.drawable.ic_uninstall_no_shadow);
             updateText(R.string.uninstall_drop_target_label);
         } else if (action == DISMISS_PREDICTION) {
-            setDrawable(R.drawable.ic_block_shadow);
+            setDrawable(R.drawable.ic_block_no_shadow);
             updateText(R.string.dismiss_prediction_label);
         } else if (action == RECONFIGURE) {
-            setDrawable(R.drawable.ic_setup_shadow);
+            setDrawable(R.drawable.ic_setting);
             updateText(R.string.gadget_setup_text);
         }
     }