From a84e9cdc086d8551d807d32b8066babfdfe1d5d5 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Wed, 7 Oct 2026 07:48:00 -0400 Subject: [PATCH] File manager: the Linux system's root under Storage A "Linux system" entry in the file manager's Storage list (the rail and the drive menu) opens the root of the Linux system the sessions run in - the app's files/linuxfs, the desktop's / - so its files can be browsed, copied in and out without the desktop. Shown once the runtime is installed; Back stops at that root like a drive's, and the drive label reads Linux system anywhere under it. The label is translated in all nine languages. --- .../droiddeck/launcher/files/FileManagerModel.kt | 5 +++++ .../launcher/files/FileManagerScreen.kt | 16 ++++++++++++++++ app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 11 files changed, 30 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerModel.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerModel.kt index 741211e130..eac7dc463f 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerModel.kt @@ -99,5 +99,10 @@ fun describeLocation(file: File): FavLocation { } } + // The Linux system's root (the app's files/linuxfs, the sessions' /) and anything under it. + if (Regex("/files/linuxfs(/|$)").containsMatchIn(abs)) { + return FavLocation(FavStorage.OTHER, R.string.fm_drive_linux, abs) + } + return FavLocation(FavStorage.OTHER, R.string.fm_drive_storage, abs) } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 56556fabac..9f9361ad7b 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -42,6 +42,7 @@ import androidx.compose.material.icons.filled.ViewList import androidx.compose.material.icons.filled.StarBorder import androidx.compose.material.icons.filled.Storage import androidx.compose.material.icons.filled.Smartphone +import androidx.compose.material.icons.filled.Terminal import androidx.compose.material.icons.filled.Download import androidx.compose.material.icons.filled.Description import androidx.compose.material.icons.filled.Image @@ -430,6 +431,9 @@ fun FileManagerScreen( onDispose { lifecycleOwner.lifecycle.removeObserver(observer) } } val drives = remember(storageTick) { StorageRoots.list(context) } + val linuxRoot = remember(storageTick) { + com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context).takeIf { File(it, "usr").isDirectory } + } // ── Dialogs ── @@ -690,6 +694,16 @@ fun FileManagerScreen( }, ) } + linuxRoot?.let { root -> + MenuItemDivider() + DropdownMenuItem( + text = { Text(stringResource(R.string.fm_drive_linux)) }, + leadingIcon = { + Icon(Icons.Filled.Terminal, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp)) + }, + onClick = { showDriveMenu = false; openDrive(root) }, + ) + } } } @@ -998,6 +1012,8 @@ fun FileManagerScreen( showFavorites = false; if (d.readable) openDrive(d.dir) }) } + // The Linux system the sessions run in: its own / (the desktop's root), once installed. + linuxRoot?.let { add(locItem(stringResource(R.string.fm_drive_linux), Icons.Filled.Terminal, it)) } } val quickItems = buildList { File("/storage/emulated/0/Download").takeIf { it.isDirectory }?.let { add(locItem(stringResource(R.string.fm_rail_downloads), Icons.Filled.Download, it, stringResource(R.string.fm_rail_downloads_short))) } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a17a31e676..71f2926b22 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1401,6 +1401,7 @@ Interno + Sistema Linux Tarjeta SD Almacenamiento Seleccionar diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0439c85ecc..1c464ee0dc 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -947,4 +947,5 @@ Fichiers du jeu enregistrés dans %1$s Fichiers frontaux Remonter d\'un niveau + Système Linux \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e22b963658..b47291cde4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1377,6 +1377,7 @@ 内部 + Linux システム SDカード ストレージ 選択 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 04b781dac6..b1630b7b07 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1377,6 +1377,7 @@ 내부 + Linux 시스템 SD 카드 저장소 선택 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1504ef112d..b4234bcd23 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -955,4 +955,5 @@ Файлы игры сохранены в %1$s Файлы фронтенда На уровень вверх + Система Linux \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cb70864328..d1505c0e4d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1377,6 +1377,7 @@ 内部存储 + Linux 系统 SD 卡 存储 选择 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 2f14bbf6d6..b7a9c3e097 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1377,6 +1377,7 @@ 內部 + Linux 系統 SD 卡 儲存空間 選取 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 52bf7f3fed..c95ceccfc9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1377,6 +1377,7 @@ 內部 + Linux 系統 SD 卡 儲存空間 選取 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 80b8e958b2..05416d2f51 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1345,6 +1345,7 @@ Many systems Internal + Linux system SD card Storage Select