From 5fa72cf48c72a1d952ac361649b29d2bcb2c542d Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Tue, 6 Oct 2020 13:06:11 -0400 Subject: [PATCH] For #15115 - Part 5: Don't draw any background when swiping to delete a tab --- .../main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt index b9189c555..0f9fbe962 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabsTouchHelper.kt @@ -17,6 +17,7 @@ import mozilla.components.support.ktx.android.content.getColorFromAttr import mozilla.components.support.ktx.android.content.getDrawableWithTint import mozilla.components.support.ktx.android.util.dpToPx import org.mozilla.fenix.R +import org.mozilla.fenix.ext.settings import org.mozilla.fenix.home.sessioncontrol.SwipeToDeleteCallback /** @@ -68,6 +69,10 @@ class TouchCallback( ) { super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive) + if (recyclerView.context.settings().gridTabView) { + return + } + val icon = recyclerView.context.getDrawableWithTint( R.drawable.ic_delete, recyclerView.context.getColorFromAttr(R.attr.destructive)