diff --git a/controller/app/src/main/java/org/iiab/controller/redesign/SettingsFragment.java b/controller/app/src/main/java/org/iiab/controller/redesign/SettingsFragment.java
index 8921cb83..472e8edc 100644
--- a/controller/app/src/main/java/org/iiab/controller/redesign/SettingsFragment.java
+++ b/controller/app/src/main/java/org/iiab/controller/redesign/SettingsFragment.java
@@ -36,6 +36,18 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
SettingsUi.preview(ctx, list, getString(R.string.k2go_settings_help), null);
SettingsUi.row(ctx, list, getString(R.string.k2go_settings_send_feedback), null, null, v -> openFeedback());
SettingsUi.row(ctx, list, getString(R.string.k2go_settings_about), null, versionName(), v -> openSub("about"));
+ // ADFA-4968: promote the System block (was inside Advanced) to the top level, below About.
+ SettingsUi.sectionHeader(ctx, list, getString(R.string.k2go_settings_sec_system));
+ SettingsUi.row(ctx, list, getString(R.string.k2go_settings_module_mgmt), getString(R.string.k2go_settings_module_mgmt_sub), null, v -> {
+ android.content.Intent i = new android.content.Intent(ctx, SetupLibraryActivity.class);
+ i.putExtra(SetupLibraryActivity.EXTRA_MODULE_MGMT, true);
+ ctx.startActivity(i);
+ });
+ SettingsUi.row(ctx, list, getString(R.string.k2go_settings_backups), getString(R.string.k2go_br_row_sub), null, v -> {
+ android.content.Intent i = new android.content.Intent(ctx, SetupLibraryActivity.class);
+ i.putExtra(SetupLibraryActivity.EXTRA_BACKUP_RESTORE, true);
+ ctx.startActivity(i);
+ });
SettingsUi.row(ctx, list, getString(R.string.k2go_settings_advanced), getString(R.string.k2go_settings_advanced_sub), null, v -> openSub("advanced"));
buildFooter(ctx, footer);
diff --git a/controller/app/src/main/java/org/iiab/controller/redesign/SettingsSubFragment.java b/controller/app/src/main/java/org/iiab/controller/redesign/SettingsSubFragment.java
index b4695f42..42c82d44 100644
--- a/controller/app/src/main/java/org/iiab/controller/redesign/SettingsSubFragment.java
+++ b/controller/app/src/main/java/org/iiab/controller/redesign/SettingsSubFragment.java
@@ -204,21 +204,9 @@ private void openTerminal(Context ctx) {
// ---- Advanced (power-user features — preview for now) ----
private void buildAdvanced(Context ctx, LinearLayout list) {
+ // ADFA-4968: System (Module management, Backups & recovery) moved to the Settings top level.
+ // With System gone the DEVELOPER header is redundant, so Advanced is just the developer tools.
SettingsUi.caption(ctx, list, getString(R.string.k2go_settings_power_users));
- SettingsUi.sectionHeader(ctx, list, getString(R.string.k2go_settings_sec_system));
- SettingsUi.row(ctx, list, getString(R.string.k2go_settings_module_mgmt), getString(R.string.k2go_settings_module_mgmt_sub), null, v -> {
- // ADFA-4842: entry-point-agnostic launch of the module hub (also reachable from Get More).
- android.content.Intent i = new android.content.Intent(ctx, SetupLibraryActivity.class);
- i.putExtra(SetupLibraryActivity.EXTRA_MODULE_MGMT, true);
- ctx.startActivity(i);
- });
- SettingsUi.row(ctx, list, getString(R.string.k2go_settings_backups), getString(R.string.k2go_br_row_sub), null, v -> {
- // ADFA-4952: Backup & restore hub (SAF, one step per direction).
- android.content.Intent i = new android.content.Intent(ctx, SetupLibraryActivity.class);
- i.putExtra(SetupLibraryActivity.EXTRA_BACKUP_RESTORE, true);
- ctx.startActivity(i);
- });
- SettingsUi.sectionHeader(ctx, list, getString(R.string.k2go_settings_sec_developer));
SettingsUi.preview(ctx, list, "ADB", null);
SettingsUi.row(ctx, list, getString(R.string.k2go_settings_network_dns), getString(R.string.setup_dns_hint), null, v -> openSub("dns"));
SettingsUi.row(ctx, list, "Terminal (Debian)", null, null, v -> openTerminal(ctx));
diff --git a/controller/app/src/main/res/layout/fragment_k2go_settings.xml b/controller/app/src/main/res/layout/fragment_k2go_settings.xml
index ad548b3e..e65cd44d 100644
--- a/controller/app/src/main/res/layout/fragment_k2go_settings.xml
+++ b/controller/app/src/main/res/layout/fragment_k2go_settings.xml
@@ -3,6 +3,11 @@
android:layout_width="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:background="@color/k2go_paper">
+
+
Theme
Help
Send feedback
- System, backups, developer tools
+ Developer tools
Light
Follow system
Dark