Skip to content

[pull] main from ankidroid:main#772

Merged
pull[bot] merged 5 commits intobkzhn:mainfrom
ankidroid:main
Mar 28, 2026
Merged

[pull] main from ankidroid:main#772
pull[bot] merged 5 commits intobkzhn:mainfrom
ankidroid:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Mar 28, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

lukstbit and others added 5 commits March 28, 2026 01:16
The color indicator used by the color picker dialog was using a circle
drawable that was declared only for android versions > 31 so below this
it would crash.

The fix consists in adding an identical circle drawable available for
all Android versions. This produces the same behavior for newer Android
versions but doesn't work on lower versions where the clipping is not
done and we end up with a square color indicator.

To fix this, the placement of the color indicator was updated for these
lower versions so it doesn't clip the outer view and to look reasonable well.
See LayoutPrefixDetector

I went through `TEMPORARILY_IGNORED` and made judgment calls

`view_` layouts were used as a catchall

I feel 'preference_' and 'page_' should be prefixes, so I kept them
'popup_' optional

* card_browser_appearance.xml => activity_card_browser_appearance.xml
* card_template_editor.xml => activity_card_template_editor.xml
* info.xml => activity_info.xml
* introduction_activity.xml => activity_introduction.xml
* navigation_drawer_layout.xml => activity_navigation_drawer.xml
* navigation_drawer_layout_fullscreen.xml =>
activity_navigation_drawer_fullscreen.xml
* note_type_field_editor.xml => activity_note_type_field_editor.xml
* reviewer.xml => activity_reviewer.xml
* reviewer_fullscreen.xml => activity_reviewer_fullscreen.xml
* reviewer_fullscreen_noanswers.xml =>
activity_reviewer_fullscreen_noanswers.xml
* single_fragment_activity.xml => activity_single_fragment.xml
* studyoptions.xml => activity_study_options.xml
* add_edit_reminder_dialog.xml => dialog_add_edit_reminder.xml
* alert_dialog_checkbox.xml => dialog_alert_dialog_checkbox.xml
* alert_dialog_title_with_help.xml =>
dialog_alert_dialog_title_with_help
.xml
* browser_columns_selection.xml => dialog_browser_columns_selection.xml
* change_note_type_dialog.xml => dialog_change_note_type.xml
* control_preference.xml => dialog_control_preference.xml
* locale_selection_dialog.xml => dialog_locale_selection.xml
* note_editor_toolbar_add_custom_item.xml =>
dialog_note_editor_toolbar_add_custom_item.xml
* note_editor_toolbar_edit_custom_item.xml =>
dialog_note_editor_toolbar_edit_custom_item.xml
* rename_flag_layout.xml => dialog_rename_flag.xml
* about_layout.xml => fragment_about.xml
* bottomsheet_multimedia.xml => fragment_bottomsheet_multimedia.xml
* card_browser_fragment.xml => fragment_card_browser.xml
* card_browser_searchview_fragment.xml =>
fragment_card_browser_searchview.xml
* card_template_editor_item.xml =>
fragment_card_template_editor_template
.xml
* check_pronunciation_fragment.xml => fragment_check_pronunciation.xml
* drawing_fragment.xml => fragment_drawing.xml
* internet_permission_fragment.xml => fragment_internet_permission.xml
* introduction_layout.xml => fragment_introduction.xml
* my_account.xml => fragment_my_account.xml
* my_account_logged_in.xml => fragment_my_account_logged_in.xml
* note_editor_fragment.xml => fragment_note_editor.xml
* notifications_permission.xml => fragment_notifications_permission.xml
* page_fragment.xml => fragment_page.xml
* permissions_bottom_sheet.xml => fragment_permissions_bottom_sheet.xml
* preferences.xml => fragment_preferences.xml
* previewer.xml => fragment_previewer.xml
* reviewer2.xml => fragment_reviewer.xml
* set_due_date_range.xml => fragment_set_due_date_range.xml
* set_due_date_single.xml => fragment_set_due_date_single.xml
* deck_picker.xml => include_deck_picker.xml
* floating_add_button.xml => include_floating_add_button.xml
* reviewer_flashcard_fullscreen.xml =>
include_reviewer_flashcard_fullscreen.xml
* controls_tab_layout.xml => preference_controls_tab.xml
* extended_category.xml => preference_extended_category.xml
* browser_column_cell.xml => view_browser_column_cell.xml
* browser_column_heading.xml => view_browser_column_heading.xml
* colorpicker_flag_bubble.xml => view_colorpicker_flag_bubble.xml
* instant_editor_field_layout.xml => view_instant_editor_field.xml
* navdrawer_header.xml => view_navdrawer_header.xml
* note_editor_toolbar.xml => view_note_editor_toolbar.xml
* popup_brush_options.xml => view_popup_brush_options.xml
* popup_eraser_options.xml => view_popup_eraser_options.xml
* progress_bar.xml => activity_progress_bar.xml
* resizing_divider_internal.xml => view_resizing_divider_internal.xml
* spinner_dropdown_item_with_radio.xml =>
item_spinner_dropdown_with_radio.xml
* sync_progress_layout.xml => view_sync_progress_layout.xml
* tab_layout_icon_on_end.xml => view_tab_layout_icon_on_end.xml
* studyoptions_fragment.xml => fragment_study_options.xml
* preferences_reviewer_menu.xml => fragment_preferences_reviewer_menu.xml

Issue 20516
Allows us to remove `LayoutPrefixDetector.TEMPORARILY_IGNORED`

Fixes 20516
@pull pull bot locked and limited conversation to collaborators Mar 28, 2026
@pull pull bot added the ⤵️ pull label Mar 28, 2026
@pull pull bot merged commit 397db3f into bkzhn:main Mar 28, 2026
12 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants