From 9798a11e51a608f8a26296eb897a461234e62ab2 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 17 Nov 2025 11:17:24 -0400
Subject: [PATCH] Apply window insets to bottom action bar if they're not
 already consumed.

---
 .../securesms/components/menu/SignalBottomActionBar.kt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt
index 8a5b1b4882..1f93912e20 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalBottomActionBar.kt
@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowInsets
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.ImageView
@@ -75,6 +76,15 @@ class SignalBottomActionBar(context: Context, attributeSet: AttributeSet?) : Lin
     }
   }
 
+  override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets? {
+    if (insets != null) {
+      val navigationBarInset = insets.systemWindowInsetBottom
+      val layoutParams = layoutParams as? MarginLayoutParams
+      layoutParams?.bottomMargin = navigationBarInset
+    }
+    return super.onApplyWindowInsets(insets)
+  }
+
   private fun present(items: List<ActionItem>) {
     if (width == 0) {
       return