From 55efc715d77436a74b04a8fbaedd8338667ecb2f Mon Sep 17 00:00:00 2001
From: Konstantin Svist <svist@google.com>
Date: Fri, 1 Nov 2024 17:42:23 -0700
Subject: [PATCH] Fix layout for screens where it's merged with status bar
 Should fix #1400

---
 app/src/main/res/layout/activity_custom_rules.xml | 3 ++-
 app/src/main/res/layout/activity_prefs.xml        | 3 ++-
 app/src/main/res/layout/customscript.xml          | 3 ++-
 app/src/main/res/layout/help_about.xml            | 3 ++-
 app/src/main/res/layout/log_view.xml              | 3 ++-
 app/src/main/res/layout/rules.xml                 | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_custom_rules.xml b/app/src/main/res/layout/activity_custom_rules.xml
index 2a8a155e9..aebff70c5 100644
--- a/app/src/main/res/layout/activity_custom_rules.xml
+++ b/app/src/main/res/layout/activity_custom_rules.xml
@@ -5,7 +5,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
-    tools:context="dev.ukanth.ufirewall.activity.CustomRulesActivity">
+    tools:context="dev.ukanth.ufirewall.activity.CustomRulesActivity"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/custom_toolbar_rules"
diff --git a/app/src/main/res/layout/activity_prefs.xml b/app/src/main/res/layout/activity_prefs.xml
index af591398a..ce8039b81 100644
--- a/app/src/main/res/layout/activity_prefs.xml
+++ b/app/src/main/res/layout/activity_prefs.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/customscript.xml b/app/src/main/res/layout/customscript.xml
index 52e91a601..d87afcd85 100644
--- a/app/src/main/res/layout/customscript.xml
+++ b/app/src/main/res/layout/customscript.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/custom_toolbar"
diff --git a/app/src/main/res/layout/help_about.xml b/app/src/main/res/layout/help_about.xml
index 785b5a3de..51e8f9bb0 100644
--- a/app/src/main/res/layout/help_about.xml
+++ b/app/src/main/res/layout/help_about.xml
@@ -4,7 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:duplicateParentState="false"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/help_toolbar"
diff --git a/app/src/main/res/layout/log_view.xml b/app/src/main/res/layout/log_view.xml
index 50c18f1c4..928d90880 100644
--- a/app/src/main/res/layout/log_view.xml
+++ b/app/src/main/res/layout/log_view.xml
@@ -5,7 +5,8 @@
     android:layout_height="fill_parent"
     android:duplicateParentState="false"
     android:background="?attr/itemBackground"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/rule_toolbar"
diff --git a/app/src/main/res/layout/rules.xml b/app/src/main/res/layout/rules.xml
index ff045c39b..48f96e90d 100644
--- a/app/src/main/res/layout/rules.xml
+++ b/app/src/main/res/layout/rules.xml
@@ -5,7 +5,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:background="?attr/itemBackground"
-    android:duplicateParentState="false">
+    android:duplicateParentState="false"
+    android:fitsSystemWindows="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/rule_toolbar"