Skip to content

fix: settings activity action bar padding #16106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 1 commit into from
Dec 10, 2025
Merged

fix: settings activity action bar padding #16106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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;
Expand All @@ -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();
Expand Down
Loading