[david-allison]

Note

Assisted-by: GPT-6-Astra xhigh

Purpose / Description

Editing a toolbar button did not allow either field to be blank.

But this was useful: <br> would want the cursor to be placed afterwards.

Fixes

• Fixes Note Editor Toolbar buttons: if editing, cursor is unsupported at extremities #22660

Approach

How does this change address the problem?

How Has This Been Tested?

Unit tested

Checklist

• You have a descriptive commit message with a short title (first line, max 50 chars).
• You have commented your code, particularly in hard-to-understand areas
• You have performed a self-review of your own code
• UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
• UI Changes: You have tested your change using the Google Accessibility Scanner

[github-actions]

Snapshot diff report vs main. Open screenshot-diff for diffs.

• AnkiDroid/DeckPickerTabletScreenshotTest/diffs: 1 change

All 1 changed screenshots

AnkiDroid/DeckPickerTabletScreenshotTest/diffs

• keyboard_open_compare.png

[mikehardy]

Assisted-by: grok-4.7-medium

Thanks for fixing the edit-toolbar blank-side case — this matches how create already behaved.

Checked out the PR branch, rebased cleanly onto current ankidroid/main, and did not push (reviewed GitHub head 0159157e36b16ea572ffb165183a6deb9709dc64). Locally ran buildSrc tests, lintAll / ktlintCheck / lint-rules:test, jacocoUnitTestReport (including new NoteEditorToolbarTest), and release emulator tests on API 36 Google APIs Play 16K (emulator-5554); all green on the rebased replay.

displayEditToolbarDialog now saves the dialog’s before/after strings as-is instead of restoring empty fields from the old button, enables Save only when at least one side is non-blank, and keeps TextWrapper caret placement at the start or end of a <br> insertion. New unit tests cover caret position and Save enabled state.

some acceptable findings, no action required, just leaving for posterity: Approach template still placeholder; commit subject could be shorter; no inline error when both fields are blank.

Screenshot changes have been detected, so leaving this for a good manual look.

[david-allison]

Screenshot is a flake, this can go