From b82a9881fea59cc7ae11f68da4d85a75af924700 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 9 Dec 2025 15:01:54 +0100
Subject: [PATCH] fix: settings activity action bar padding

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../android/ui/activity/SettingsActivity.java | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
index ffdbfd72ae9a..53b3a9496627 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
@@ -24,7 +24,6 @@
 import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -41,11 +40,9 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.webkit.URLUtil;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.nextcloud.android.common.ui.util.extensions.WindowExtensionsKt;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
@@ -57,7 +54,6 @@
 import com.nextcloud.client.preferences.AppPreferencesImpl;
 import com.nextcloud.client.preferences.DarkMode;
 import com.nextcloud.utils.extensions.ContextExtensionsKt;
-import com.nextcloud.utils.extensions.ViewExtensionsKt;
 import com.nextcloud.utils.mdm.MDMConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
@@ -154,23 +150,12 @@ public class SettingsActivity extends PreferenceActivity
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle savedInstanceState) {
-
-        boolean isApiLevel35OrHigher = (Build.VERSION.SDK_INT >= 35);
-        if (isApiLevel35OrHigher) {
-            final var window = getWindow();
-            if (window != null) {
-                WindowExtensionsKt.addSystemBarPaddings(getWindow());
-                final var flag = WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
-                window.setFlags(flag, flag);
-            }
-        }
-
         super.onCreate(savedInstanceState);
 
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
-
+        getListView().setFitsSystemWindows(true);
         setupActionBar();
 
         // Register context menu for list of preferences.
@@ -211,10 +196,6 @@ public void onCreate(Bundle savedInstanceState) {
         // workaround for mismatched color when app dark mode and system dark mode don't agree
         setListBackground();
         showPasscodeDialogIfEnforceAppProtection();
-
-        if (isApiLevel35OrHigher) {
-            adjustTopMarginForActionBar();
-        }
     }
 
     public static boolean isBackPressed = false;
@@ -230,18 +211,6 @@ public void onBackPressed() {
         }, 2000);
     }
 
-    private void adjustTopMarginForActionBar() {
-        if (getListView() == null) {
-            return;
-        }
-
-        float topMarginInDp = getResources().getDimension(R.dimen.settings_activity_padding);
-        int topMarginInPx = DisplayUtils.convertDpToPixel(topMarginInDp, this);
-        ViewExtensionsKt.setMargins(getListView(), 0, topMarginInPx, 0, 0);
-
-        getWindow().getDecorView().setBackgroundColor(ContextCompat.getColor(this, R.color.bg_default));
-    }
-
     private void showPasscodeDialogIfEnforceAppProtection() {
         if (MDMConfig.INSTANCE.enforceProtection(this) && Objects.equals(preferences.getLockPreference(), SettingsActivity.LOCK_NONE) && lock != null) {
             lock.showDialog();