Move ArraySet and tests to common [230860589]

Fixed

Bug

Status Update

No update yet.

Description

ar...@google.com

created issue #1

Apr 29, 2022 04:05PM

Move ArraySet to common. Make sure binary/source compatibility is preserved.

Comments

ar...@google.com <ar...@google.com> Apr 29, 2022 04:07PM

Accepted by ar...@google.com.

ap...@google.com <ap...@google.com> #2May 6, 2022 11:32AM

Project: platform/frameworks/support
Branch: androidx-master-dev

commit c60f33e229e31ab328ef6b59dab63b264954831c
Author: Alexandre Elias <aelias@google.com>
Date: Fri Jul 10 16:23:09 2020

Semantics no-op cleanups

Partly in response to lmr's broad code review, I did a pass of
superficial API/implementation cleanup. The main changes are:

- I changed each Boolean SemanticsProperty where false is equivalent to
not being present to take "Unit" instead. This is conceptually
clearer: it avoids questions like "can I cancel out a semantics from a
merged child by setting it to false?" Because "property = Unit" looks
weird, I also changed the style of these to "property()".

- I moved the Semantics id generator closer to where it's used, in
SemanticsModifierCore. I made it internal and an AtomicInt.
(Note that integer ids are heavily used in the Android
AccessibilityNodeInfo APIs so I can't simply remove them entirely.)

- I deleted dead code. Some examples include SemanticsHintOverrides,
a public API not connected to anything, and SemanticsPropertyKey
merge() open method which is never called. (In both cases I have
a different plan in mind for accessibility.)

Fixes: 145951226
Fixes: 145955412
Test: existing tests
Relnote: "Single-value semantics properties now use a calling style.
For example, 'semantics { hidden = true }' is now written as:
'semantics { hidden() }'."

Change-Id: Ic1afd12ea22c926babc9662f1804d80b33aa0cfc

M ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
M ui/ui-core/api/0.1.0-dev15.txt
M ui/ui-core/api/current.txt
M ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-core/api/public_plus_experimental_current.txt
M ui/ui-core/api/restricted_0.1.0-dev15.txt
M ui/ui-core/api/restricted_current.txt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/VectorTest.kt
M ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/semantics/SemanticsTests.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidActuals.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
M ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidPopup.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Expect.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsConfiguration.kt
D ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsHintOverrides.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsModifier.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsNode.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsOwner.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/core/semantics/SemanticsWrapper.kt
M ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
M ui/ui-foundation/api/0.1.0-dev15.txt
M ui/ui-foundation/api/current.txt
M ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-foundation/api/public_plus_experimental_current.txt
M ui/ui-foundation/api/restricted_0.1.0-dev15.txt
M ui/ui-foundation/api/restricted_current.txt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Clickable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Dialog.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/Scroller.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Selectable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/selection/Toggleable.kt
M ui/ui-foundation/src/main/java/androidx/ui/foundation/semantics/FoundationSemanticsProperties.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ButtonTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CardTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/CheckboxScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/RadioButtonScreenshotTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ScaffoldTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SnackbarTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/SurfaceTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/ripple/RippleIndicationTest.kt
M ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldScreenshotTest.kt
M ui/ui-material/src/main/java/androidx/ui/material/AppBar.kt
M ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/AssertsTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/CallSemanticsActionTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/ScrollToTest.kt
M ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
M ui/ui-test/src/main/java/androidx/ui/test/Actions.kt
M ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
M ui/ui-text/api/0.1.0-dev15.txt
M ui/ui-text/api/current.txt
M ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
M ui/ui-text/api/public_plus_experimental_current.txt
M ui/ui-text/api/restricted_0.1.0-dev15.txt
M ui/ui-text/api/restricted_current.txt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/CoreTextField.kt
M ui/ui-text/src/commonMain/kotlin/androidx/ui/text/TextSemanticsProperties.kt

https://android-review.googlesource.com/1360099

ap...@google.com <ap...@google.com> #3May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-main

commit c2812447dc16b0481fe7a34d343113686ac07f00
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Mon May 23 12:02:59 2022

Implement AbstractMutableCollection in ArraySet

Bug: 230860589
Test: ArraySetTest
Relnote: ArraySet now extends AbstractMutableCollection and no longer directly implements the Collection interface.
Change-Id: If6da08d5a1a41257b0b79728796509e06efe9f35

M collection/collection/api/current.ignore
M collection/collection/api/current.txt
M collection/collection/api/public_plus_experimental_current.txt
M collection/integration-tests/testapp/src/main/kotlin/androidx/collection/integration/ArraySetKotlin.kt
M collection/collection/api/restricted_current.txt
M collection/collection/src/jvmMain/kotlin/androidx/collection/ArraySet.kt
M collection/collection/api/restricted_current.ignore

https://android-review.googlesource.com/2102704

ap...@google.com <ap...@google.com> #4May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-main

commit f69db87421fe4cfe9700a20455bd691f23aff769
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 13 10:22:06 2022

Converted ArraySet to Kotlin.

There are two `toArray` methods shown as removed in the API files. This looks like a Metalava bug, because they are present in the compiled jar filed. I have filed

b/232918547

.

Bug: 230860589
Test: ArraySetTest
Relnote: """Converted ArraySet to Kotlin.
Due to stricter typing, some Kotlin calls may no longer compile.

The following calls have the argument type "T", not "T?":
- ArraySet<T>.contains(null)
- ArraySet<T>.add(null)
- ArraySet<T>.remove(null)

The following calls have the return type "T?", not "T!":
- ArraySet<T?>.valueAt(n)
- ArraySet<T?>.removeAt(n)
- ArraySet<T?>().iterator().next()

The following calls are no longer possible from Kotlin:
- set.toArray() - use set.toTypedArray()
- set.toArray(array) - use set.forEachIndexed(array::set)
"""
Change-Id: Id68c130a8451c916c1e85b8a59c76ba267297cc4

M collection/collection/api/current.txt
M development/build_log_simplifier/messages.ignore
M collection/collection/api/current.ignore
M collection/collection/api/public_plus_experimental_current.txt
M collection/integration-tests/testapp/src/main/kotlin/androidx/collection/integration/ArraySetKotlin.kt
M collection/collection/src/jvmMain/kotlin/androidx/collection/ArraySet.kt
M collection/collection/api/restricted_current.txt
M collection/collection/api/restricted_current.ignore

https://android-review.googlesource.com/2096798

ap...@google.com <ap...@google.com> #5May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-main

commit 54f252fbb8d6dfcaa09bd43249a48d6d8eba0b91
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Thu May 12 16:46:20 2022

Moved ArraySet.java to kotlin

Bug: 230860589
Test: N/A
Change-Id: I1f446bdba2a81e1cad00ecfc5b2b89cc3d119db9

M collection/collection/src/jvmMain/kotlin/androidx/collection/ArraySet.kt

https://android-review.googlesource.com/2096797

ap...@google.com <ap...@google.com> #6May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-main

commit 7989e24f65166348991db28c8b4ded1e12a92892
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Thu May 12 16:45:37 2022

Deleted ArraySet.kt

Bug: 230860589
Test: N/A
Change-Id: Iff94dc4a62b5fef6a367d93a55f07e07808fa119

D collection/collection/src/jvmMain/kotlin/androidx/collection/ArraySet.kt

https://android-review.googlesource.com/2096796

ap...@google.com <ap...@google.com> #7May 26, 2022 09:15AM

Project: platform/frameworks/support
Branch: androidx-main

commit 45d9a01ed442bedfaebfbc940430782e78e2e87f
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 13 14:25:12 2022

Copied ArraySet tests from collection2

Bug: 230860589
Test: ArraySetTest
Change-Id: I7e43b879260c88cb028cb92d942230bb8854f0ef

M collection/collection/src/jvmTest/kotlin/androidx/collection/ArraySetTest.kt

https://android-review.googlesource.com/2096795

ap...@google.com <ap...@google.com> #8Jun 10, 2022 12:28PM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-main

commit a85cde0e4f41be26349f84c59d14d8a925a08a2b
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 12:05:09 2022

Converted IndexBasedArrayIteratorTest to Kotlin

Test: IndexBasedArrayIteratorTest
Fix: 230860589
Change-Id: I25124a448eeb686f5a3750348e061552d20d674b

M collection/collection/src/commonTest/kotlin/androidx/collection/IndexBasedArrayIteratorTest.kt

https://android-review.googlesource.com/2109188

ap...@google.com <ap...@google.com> #9Jun 10, 2022 12:28PM

Project: platform/frameworks/support
Branch: androidx-main

commit 7d7766930b8178135f4559f4d8bbaafc9fac38cf
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 11:53:47 2022

Moved IndexBasedArrayIteratorTest.java file to commonMain

Test: N/A
Bug: 230860589
Change-Id: I60cb2dd796b1ae47bc40d6d8e42962d3ced17b59

M collection/collection/src/commonTest/kotlin/androidx/collection/IndexBasedArrayIteratorTest.kt

https://android-review.googlesource.com/2109187

ap...@google.com <ap...@google.com> #10Jun 10, 2022 12:28PM

Project: platform/frameworks/support
Branch: androidx-main

commit fd7e248c15a52caf45b54e4a033b135cec914142
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 11:01:46 2022

Moved ArraySet to commonMain

Relnote: Moved ArraySet to commonMain
Test: ArraySetTest
Bug: 230860589
Change-Id: I1380c1df7b87476800d900f655e6d6e9b4413197

M collection/collection/src/commonTest/kotlin/androidx/collection/ArraySetTest.kt
M collection/collection/src/commonMain/kotlin/androidx/collection/ArraySet.kt

https://android-review.googlesource.com/2109186

ap...@google.com <ap...@google.com> #11Jun 10, 2022 12:28PM

Project: platform/frameworks/support
Branch: androidx-main

commit a333ad612c7ecc33d696e6984d01e00e9f870c99
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 11:19:34 2022

Converted IndexBasedArrayIterator to Kotlin

Test: IndexBasedArrayIteratorTest
Bug: 230860589
Change-Id: I806af78481b175d9d330a82be60e233bd852380c

M collection/collection/src/jvmMain/java/androidx/collection/ArrayMap.java
M collection/collection/src/commonMain/kotlin/androidx/collection/IndexBasedArrayIterator.kt

https://android-review.googlesource.com/2109185

ap...@google.com <ap...@google.com> #12Jun 10, 2022 12:28PM

Project: platform/frameworks/support
Branch: androidx-main

commit 1afa143028480234b99714da56efb15b0bdf4883
Author: Arkadii Ivanov <arkivanov@google.com>
Date: Fri May 27 11:05:19 2022

Moved IndexBasedArrayIterator.java file to commonMain

Test: N/A
Bug: 230860589
Change-Id: If7d78f8d72e5dc7b833e967f85707be3761e0a8d

M collection/collection/src/commonMain/kotlin/androidx/collection/IndexBasedArrayIterator.kt

https://android-review.googlesource.com/2109184