diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java index 731fb0ac3..599b3b4a4 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java @@ -215,6 +215,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int return true; case MotionEvent.ACTION_CANCEL: + binding.setIsHovered(false); binding.more.setImageState(new int[]{android.R.attr.state_active},true); return false; } @@ -237,6 +238,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int return true; case MotionEvent.ACTION_CANCEL: + binding.setIsHovered(false); binding.trash.setImageState(new int[]{android.R.attr.state_active},true); return false; } diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java index bbac8fc78..a2a2fef73 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java @@ -186,6 +186,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int return true; case MotionEvent.ACTION_CANCEL: + binding.setIsHovered(false); binding.more.setImageState(new int[]{android.R.attr.state_active},true); return false; } @@ -193,10 +194,10 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int }); binding.trash.setOnHoverListener(mIconHoverListener); binding.trash.setOnTouchListener((view, motionEvent) -> { + binding.setIsHovered(true); int ev = motionEvent.getActionMasked(); switch (ev) { case MotionEvent.ACTION_UP: - binding.setIsHovered(true); if (mHistoryItemCallback != null) { mHistoryItemCallback.onDelete(view, binding.getItem()); } @@ -208,6 +209,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int return true; case MotionEvent.ACTION_CANCEL: + binding.setIsHovered(false); binding.trash.setImageState(new int[]{android.R.attr.state_active},true); return false; } diff --git a/app/src/main/res/layout/bookmark_item.xml b/app/src/main/res/layout/bookmark_item.xml index 6da1e5d6a..506f217d7 100644 --- a/app/src/main/res/layout/bookmark_item.xml +++ b/app/src/main/res/layout/bookmark_item.xml @@ -51,6 +51,7 @@ android:layout_alignParentStart="true" android:layout_centerVertical="true" android:gravity="center_vertical" + android:layout_toStartOf="@id/buttons_container" android:orientation="@{isNarrow ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL}">