Repository navigation
Merge upstream AnkiDroid main (2026-10-29) - #69
Merged
Merged
Conversation
DeckSelectionDialog's layouts and menu use keyline_1, deck_picker_right_padding, ActionBarStyle, ActionBar.Popup and ic_search_white, so these move first. The dimens keep their sw600dp values. Layouts that use them are unchanged, and DeckAdapter, DeckHierarchyLinesDecoration and DeckSelectionDialog read the dimens through CommonR. Assisted-by: Claude Opus 5.5
Saving a note now reports progress from InstantEditorViewModel, so back is ignored until the save finishes instead of closing the editor halfway through. Assisted-by: Claude Opus 5.5
The editor is a dialog, so Save could still be tapped while a note was saving. The second tap added the same note again, which failed in the backend and broke the collection until the app restarted. Save is now ignored while a note is saving or the editor is closing, both in the editor and in the no-cloze warning. The check runs before the fields are read, so an ignored Save can't change the note being saved, and confirming the warning saves the fields that were checked. Assisted-by: Claude Opus 5.5
For the reminders to fire, there needs to be at least one card due. But: this allowed two states for when our test on review history filtering could suppress the notification: * 0 cards due * cards reviewed by adding a second card, we ensure that the notifications are suppressed because a review occurred. Part of 22814 Assisted-by: GPT-6.1-Sol xhigh
Fixes 22814 Assisted-by: GPT-6.1-Sol xhigh
AnkiDroidApp sets it on startup, so VersionUtils no longer looks it up or falls back to AnkiDroidApp.TAG. Assisted-by: Claude Opus 5.5
It needs :compat. Assisted-by: Claude Opus 5.5
AndroidUtils and ClipboardUtil no longer need anything from the app. Assisted-by: Claude Opus 5.5
* launches CSV importer for text * enqueues a message for *pkg Assisted-by: GPT-6 Assisted-by: GPT-6-Astra xhigh
apkg/csv now take the same route: `TEXT_IMPORT` => `FILE_IMPORT` This is prep for better import handling, we have been misidentifying `apkg` files as text based on a faulty MIME type, having a single place to accept a file, and determine its actual contents will resolve this. A `prepareImport` => `openImport` call chain is used for handling. Also allows us to move it to a background thread in a later commit. Prep for 21430 Assisted-by: GPT-6 Assisted-by: GPT-6-Astra xhigh
Rather then a separate CSV import. Assisted-by: GPT-6 Assisted-by: GPT-6-Astra xhigh
Assisted-by: GPT-6 Assisted-by: GPT-6-Astra xhigh Assisted-by: GPT-6.1-Sol xhigh
Assisted-by: GPT-6 Assisted-by: GPT-6-Astra xhigh
We have cases where `apkg` is `text/plain`, which was previously
imported as a failed CSV ('stream did not contain valid UTF-8').
Now, we check to see if a file has an apkg extension before falling
back to UTF-8
Fixes 21430
Assisted-by: GPT-6
Assisted-by: GPT-6-Astra xhigh
Assisted-by: GPT-6.1-Sol xhigh
A [a/col]pkg MIME type is a signal, whereas `text/plain` is more ambiguous. So treat *pkg MIME types as a stronger signal than filenames/MIME hints. Filenames are still used for deck vs collection detection. Part of 21430 Assisted-by: GPT-6-Astra xhigh
When the release smoke build failed while packaging, the log hid the cause. Pass --stacktrace to both smoke steps so it shows. The run step needs it too: lint takes the flag as an input, so leaving it off makes that step redo lint. Part of 22741 Assisted-by: Claude Opus 5.5
The release smoke build sometimes ran out of heap while packaging the APKs. Raise the emulator job's Gradle heap from 3 GB to 4 GB. All the job's Gradle steps share one daemon, so they all get it. Fixes 22741 Assisted-by: Claude Opus 5.5
|
Snapshot diff report vs
All 25 changed screenshotsAnkiquestHomeScreenshotTest
CardBrowserScreenshotTest
CustomStudyScreenshotTest
DeckPickerScreenshotTest
DeckPickerTabletScreenshotTest
NavigationDrawerScreenshotTest
PreferencesScreenshotTest
ReviewRemindersScreenshotTest
StandardSearchFragmentScreenshotTest
TextInputDialogScreenshotTest
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges the 17 commits on upstream AnkiDroid main since #67.
Merged cleanly. Upstream moved
VersionUtilsandClipboardUtilintoanki-commonand addedappName, which is read fromR.string.app_name. No AnkiQuest code uses the moved files.