Update git submodules * Update frameworks/support from branch 'androidx-main' to 46f015f72a31d9806707d13c0c6ba87ca09c5218 - Merge "Combine CustomAccessibilityAction lists on merge" into androidx-main - Combine CustomAccessibilityAction lists on merge This change updates the merge policy for the CustomActions semantics property. Previously, CustomActions used the default "parent wins" merge policy. In a merged semantics tree, this meant that only the custom actions from the topmost node in the subtree would be preserved, and actions from children would be discarded. The mergePolicy for CustomActions is now updated to concatenate the lists from parent and child nodes. This results in a merged node that contains all custom actions from its entire subtree, providing more intuitive and expected behavior. Fixes: 428740546 Test: Added customActions_areMerged_whenMergeDescendantsIsTrue to CustomAccessibilityActionsTest.kt to verify the new merging behavior. Change-Id: Ic359b7fee0c3fc4ed00dff2a52684792deb00b24
1 file changed