Files
faceclaw/docs/branches.md
T
Blendman974 19944c7855 Merge temporary switcher window guard
# Conflicts:
#	app/ui/shell/shell.ts
2026-11-06 06:34:51 +01:00

3.9 KiB

Branches and pull requests

main mirrors jimrandomh/faceclaw at 6df52021c8e6c8fd843bc8d5652851e8c0fc6ab8. It tracks upstream/main; Gitea is the push remote origin and uses main as its default branch.

Each feature branch starts from this main and groups related changes, without unrelated features or environment setup. All PRs target main.

Group Branch PR Independent JS tests
build: reproducible Nix environment for Android and Wear OS build/nix-android #1 1061 passed, 2 skipped
fix: align the llama native library for Android 16 KiB pages fix/android-16k-pages #2 1061 passed, 2 skipped
feat: configurable notification defaults and bulk actions feat/notifications #3 1067 passed, 2 skipped
feat: share Android calendar selection across calendar readers feat/calendar-selection #4 1065 passed, 2 skipped
feat: configure head-up wake and wake angle feat/head-up-wake #5 1063 passed, 2 skipped
feat: system menu controls for app closing, full screen and keep awake feat/app-controls #6 1076 passed, 2 skipped
feat: language selection for OpenAI and on-device Whisper feat/whisper-languages #7 1067 passed, 2 skipped
feat: configurable app and system menu hold gestures feat/menu-gesture-preference #8 1072 passed, 2 skipped

| feat: editable launcher folders, icon layout and open-window order | feat/launcher-layout | #9 | 1080 passed, 2 skipped |

All independent branches also passed tsc --noEmit. The head-up branch received a final import-only cleanup and was typechecked/linted again.

build/all-features merges the nine feature branches and retains the combined validation records. It is the branch for APK builds, not a feature PR. Develop a change on its feature branch, then merge it into the build branch; do not merge the build branch back into a feature branch.

Cleanup archive

The tag archive/before-pr-cleanup-2026-11-06 preserves the complete previous integration history. Replaced branch tips are recorded below; no original feature implementation was discarded.

Previous branch Archived commit
build/wearos-release 2b14ea38b468241ebb5c4d3c0808e6df977ed93a
chore/nix-build-fixes 096510f5adef7c5ed369a89bcca9a1b8144dc51e
chore/nix-devenv 19cf564251507617982cd1ed1da66de317b38ff0
feat/app-fullscreen 49099d5efe6f32f91e0147b81cd613b2043d3378
feat/app-switcher-close-menu be939f401bdb1372b0f6c9faef754d7a10ff4118
feat/notification-filter-default 5b3a4fa7475664733ca1dbed5d532347bf57c1a6
integration/device-preferences 1d230a401471b99d6136f27916dd90e98033ea26
fix/android-16k-pages before squashing/rebase 68c9dc7ae997c17327433e5b6481e64d6fecca9f
feat/calendar-selection before squashing/rebase 6397928c60fd227fae1d50532933fa390e415ff8
feat/head-up-wake before squashing/rebase 398c62af9adc1401fd3f5d96a5332dab693619bf
feat/whisper-languages before squashing/rebase c5b57e85b0759bac594a50d9dc870fa1b26d155b

The three Nix/build branches were consolidated into build/nix-android. The switcher-close and full-screen branches were consolidated into feat/app-controls. Notification defaults and dismissal remain together in feat/notifications.

Hardware validation remains separate from software checks. No firmware was flashed during this cleanup.