Merge "Use a selector instead of loading resource for drop target." into sc-dev am: b1e51e2a3f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14817811

Change-Id: Ieb674f68802b1550eb2675b0c0a7ef5abf233779
This commit is contained in:
TreeHugger Robot
2021-06-04 12:49:20 +00:00
committed by Automerger Merge Worker
3 changed files with 25 additions and 8 deletions
@@ -142,11 +142,6 @@ public abstract class ButtonDropTarget extends TextView
}
}
private void setBackgroundDrawable(int resId) {
Drawable bd = AppCompatResources.getDrawable(getContext(), resId);
setBackground(bd);
}
@Override
public final void onDragEnter(DragObject d) {
if (!mAccessibleDrag && !mTextVisible) {
@@ -172,7 +167,7 @@ public abstract class ButtonDropTarget extends TextView
}
d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
setBackgroundDrawable(R.drawable.drop_target_frame_hover);
setSelected(true);
if (d.stateAnnouncer != null) {
d.stateAnnouncer.cancel();
}
@@ -190,7 +185,7 @@ public abstract class ButtonDropTarget extends TextView
if (!d.dragComplete) {
d.dragView.setAlpha(1f);
setBackgroundDrawable(R.drawable.drop_target_frame);
setSelected(false);
} else {
d.dragView.setAlpha(DRAG_VIEW_HOVER_OVER_OPACITY);
}
@@ -230,6 +225,7 @@ public abstract class ButtonDropTarget extends TextView
public void onDragEnd() {
mActive = false;
setOnClickListener(null);
setSelected(false);
}
/**