commit | a3a6f51b12b30591301efce0211c51bb47a8deaa | [log] [tgz] |
---|---|---|
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 [diff] [blame] |
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
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); }