aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-06Merge "Merge cherrypicks of ['android-review.googlesource.com/2598985', ↵snap-temp-L97700000961141262snap-temp-L33500000961107383Android Build Coastguard Worker
'android-review.googlesource.com/2607265', 'android-review.googlesource.com/2598886', 'android-review.googlesource.com/2608947', 'android-review.googlesource.com/2607095'] into androidx-compose-beta-release." into androidx-compose-beta-release
2023-06-06Merge cherrypicks of ['android-review.googlesource.com/2598985', ↵Android Build Coastguard Worker
'android-review.googlesource.com/2607265', 'android-review.googlesource.com/2598886', 'android-review.googlesource.com/2608947', 'android-review.googlesource.com/2607095'] into androidx-compose-beta-release. Change-Id: Icd53c50ddfc59b588675c54e5f4ac3f8126b661f
2023-06-06Merge "Optimize derived state reads in lazy layouts" into ↵Android Build Coastguard Worker
snap-temp-L75800000961093494
2023-06-06Optimize derived state reads in lazy layoutsAndrey Kulikov
Instead of delegating to derived state of item provider in the object we pass to LazyLayout we will pass a lambda allowing to read a final resolved object only a few times per the measure pass instead or reading this state everywhere. Aside from that this cl refactors nearest range and NearestRangeKeyIndexMap calculation without extra derived states for each. Benchmark results for LazyListScrollingBenchmark.scrollProgrammatically_noNewItems Before: 1,397,402 ns After: 981,970 ns Test: existing tests and benchmarks (cherry picked from https://android-review.googlesource.com/q/commit:f93d621360a7fd48afa53ac0f0cd5011bd6e118a) Merged-In: Ie9fb7bbba489d9e54c9dcb075e59bcb577771ccf Change-Id: Ie9fb7bbba489d9e54c9dcb075e59bcb577771ccf
2023-06-06Merge "Decrease amount of allocations in lazy layouts" into ↵Android Build Coastguard Worker
snap-temp-L75800000961093494
2023-06-06Decrease amount of allocations in lazy layoutsAndrey Kulikov
Tested on LazyListScrollingBenchmark.scrollProgrammatically_noNewItems Before: 1,433,275 ns 255 allocs After: 1,370,767 ns 191 allocs Test: existing tests and benchmarks (cherry picked from https://android-review.googlesource.com/q/commit:6aee2ac85a7f34eb7d583e31e2add6cb365c215b) Merged-In: I57ce5e07812a5d7b9c336010794b4fda450efc24 Change-Id: I57ce5e07812a5d7b9c336010794b4fda450efc24
2023-06-06Merge "Do not rerun placement block of layout modifiers when parent moves ↵Android Build Coastguard Worker
children" into snap-temp-L75800000961093494
2023-06-06Do not rerun placement block of layout modifiers when parent moves childrenAndrey Kulikov
Currently we run all the user provided layout modifiers even when the node is not marked dirty. For example it happens on every scroll of lazy lists. We can skip this work in most of the conditions. A few other small optimizations are added as part of this cl. This cl improves LazyListScrollingBenchmark.scrollProgrammatically_noNewItems() by ≈ 11 percent from 1,643,646 ns to 1,477,123 ns. Test: DrawReorderingTest, GraphicsLayerTest and PlacementLayoutCoordinatesTest (cherry picked from https://android-review.googlesource.com/q/commit:337ab2221cab00157b72a74de347c2aab6fcfc9a) Merged-In: I6b849ea0ddc00110446998ee68023a9eeab0bdeb Change-Id: I6b849ea0ddc00110446998ee68023a9eeab0bdeb
2023-06-06Merge "Combine value and dependencies in one DerivedState.Record" into ↵Android Build Coastguard Worker
snap-temp-L75800000961093494
2023-06-06Combine value and dependencies in one DerivedState.RecordAndrey Kulikov
So when we need to read both at the same time in SnapshotStateObserver we don't execute current record getter two times. Test: run existing tests (cherry picked from https://android-review.googlesource.com/q/commit:a1ae12a4afa2aaf33ff3d258b74e84e5c228a0e9) Merged-In: I2a4fdf188b6103728062e40e9e204c53f2f71e26 Change-Id: I2a4fdf188b6103728062e40e9e204c53f2f71e26
2023-06-06Merge "Cache keys when the user didn't provide the factory in lazy layouts" ↵Android Build Coastguard Worker
into snap-temp-L75800000961093494
2023-06-06Cache keys when the user didn't provide the factory in lazy layoutsAndrey Kulikov
This cl improves LazyListScrollingBenchmark.scrollProgrammatically_noNewItems_withoutKeys by ≈ 19 percent from 1,827,897 ns to 1,481,172 ns and decreased allocations from 296 to 255 Test: run benchmarks (cherry picked from https://android-review.googlesource.com/q/commit:99b9fa8fb6d19cabf99110166395fec26e0a0d6d) Merged-In: Iff2accba687c1a31808a3c2e875422e4668fcdd1 Change-Id: Iff2accba687c1a31808a3c2e875422e4668fcdd1
2023-06-06Merge "Merge cherrypicks of ['android-review.googlesource.com/2613770'] into ↵snap-temp-L68900000961093057snap-temp-L45700000961092147Android Build Coastguard Worker
androidx-compose-beta-release." into androidx-compose-beta-release
2023-06-06Merge cherrypicks of ['android-review.googlesource.com/2613770'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release. Change-Id: Ib7fc79fb1f0f3a989953804c2727c98462608162
2023-06-06Merge "Only apply <type>aar</type> workaround for artifacts that publish ↵Android Build Coastguard Worker
aars" into snap-temp-L16500000961092493
2023-06-06Only apply <type>aar</type> workaround for artifacts that publish aarsAurimas Liutikas
For multiplatform projects aars are published under `-android` artifact. Test: ./gradlew createArchive -> no longer see type aar for dependencies such as androidx.compose.foundation:foundation Bug: 285600312 (cherry picked from https://android-review.googlesource.com/q/commit:1910832ac290ef427d3b72301e56dd9e5fc0261d) Merged-In: I55823d3f4d15f92947114804909a7b18ac6ee696 Change-Id: I55823d3f4d15f92947114804909a7b18ac6ee696
2023-06-05Merge "Merge cherrypicks of ['android-review.googlesource.com/2616089'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release." into androidx-compose-beta-release
2023-06-05Merge cherrypicks of ['android-review.googlesource.com/2616089'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release. Change-Id: Idc248b3eb084fbdec1a22748c8d61070a6fb5b2e
2023-06-05Merge "Disable owners file generation that is problematic" into ↵Android Build Coastguard Worker
snap-temp-L30600000961081168
2023-06-05Disable owners file generation that is problematicAurimas Liutikas
Test: None (cherry picked from https://android-review.googlesource.com/q/commit:2e9f898fc0ef6e9248b4bcd42724cb1e87f40efb) Merged-In: I64decf0cf28e3998ca2ae0a50fafc6e287f9d72b Change-Id: I64decf0cf28e3998ca2ae0a50fafc6e287f9d72b
2023-05-31Merge "Merge cherrypicks of ['android-review.googlesource.com/2607534'] into ↵snap-temp-L95500000960984607snap-temp-L52500000961072266snap-temp-L19400000961050972snap-temp-L07300000960990976Android Build Coastguard Worker
androidx-compose-beta-release." into androidx-compose-beta-release
2023-05-31Merge cherrypicks of ['android-review.googlesource.com/2607534'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release. Change-Id: I1ce942e6c0fa5bd24ff2bc771822f7b58456ba25
2023-05-31Merge "Add default includeFontPadding tests for wear compose material" into ↵Android Build Coastguard Worker
snap-temp-L49500000960990396
2023-05-31Add default includeFontPadding tests for wear compose materialSteve Bower
Copy of aosp/2599298 restricted to just the wear/compose/material changes (cherry picked from https://android-review.googlesource.com/q/commit:42d8f9c1881dbbbc76ea5fdf7f7efca2c4113ad8) Merged-In: I737edd967b9997de5fff260728a760ec0a747028 Change-Id: I737edd967b9997de5fff260728a760ec0a747028
2023-05-30Merge "Merge cherrypicks of ['android-review.googlesource.com/2598717'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release." into androidx-compose-beta-release
2023-05-30Merge cherrypicks of ['android-review.googlesource.com/2598717'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release. Change-Id: Ia43068c33c2d79fc080bbcd889ba9965dda9470b
2023-05-30Merge "Introduce asComposePaint API" into snap-temp-L70600000960978477Android Build Coastguard Worker
2023-05-30Introduce asComposePaint APINader Jawad
Relnote: "Added asComposePaint API to replace toComposePaint as the returned object wraps the original android.graphics.Paint" Fixes: 265688838 Test: Updated test references to call asComposePaint instead of toComposePaint (cherry picked from commit 84d58a5d0c2afefcb2288f1d31516165ed6147ca) (cherry picked from https://android-review.googlesource.com/q/commit:0a36dee27e9109d2c0904d498868ca2dae5c470f) Merged-In: I22b4c3b279f05277536465f2d5d701030268420f Change-Id: I22b4c3b279f05277536465f2d5d701030268420f
2023-05-30Merge "Merge cherrypicks of ['android-review.googlesource.com/2609226'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release." into androidx-compose-beta-release
2023-05-30Merge cherrypicks of ['android-review.googlesource.com/2609226'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release. Change-Id: Ife101841a7b53790ad2a1e6525e82e3dc29cb464
2023-05-30Merge "updated core and emoji versions Test: ./gradlew updateApi (cherry ↵Android Build Coastguard Worker
picked from https://android-review.googlesource.com/q/commit:6a0e723c20351f3cf4087325814257a1a89bf9ce) Merged-In: Ic087e480a97130c51e49f34faff36dedd2a6c5c7 Change-Id: Ic087e480a97130c51e49f34faff36dedd2a6c5c7" into snap-temp-L71500000960966054
2023-05-30updated core and emoji versionsJuan Rodriguez
Test: ./gradlew updateApi (cherry picked from https://android-review.googlesource.com/q/commit:6a0e723c20351f3cf4087325814257a1a89bf9ce) Merged-In: Ic087e480a97130c51e49f34faff36dedd2a6c5c7 Change-Id: Ic087e480a97130c51e49f34faff36dedd2a6c5c7
2023-05-30Merge "Merge cherrypicks of ['android-review.googlesource.com/2607605'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release." into androidx-compose-beta-release
2023-05-30Merge cherrypicks of ['android-review.googlesource.com/2607605'] into ↵Android Build Coastguard Worker
androidx-compose-beta-release. Change-Id: Ib33d81488aba9a7cd8c48fa52115ba77f951cd75
2023-05-30Merge "Bump WEAR_COMPOSE_MATERIAL3 to 1.0.0-alpha06 (cherry picked from ↵Android Build Coastguard Worker
https://android-review.googlesource.com/q/commit:12c3116e5936be98950f42242c457ae0b6b12a06) Merged-In: I94f2bb904972c9cfbb1f357489af58335f694b1e Change-Id: I94f2bb904972c9cfbb1f357489af58335f694b1e" into snap-temp-L90700000960964665
2023-05-30Bump WEAR_COMPOSE_MATERIAL3 to 1.0.0-alpha06Steve Bower
(cherry picked from https://android-review.googlesource.com/q/commit:12c3116e5936be98950f42242c457ae0b6b12a06) Merged-In: I94f2bb904972c9cfbb1f357489af58335f694b1e Change-Id: I94f2bb904972c9cfbb1f357489af58335f694b1e
2023-05-30Merge "Merge cherrypicks of ['android-review.googlesource.com/2597166', ↵Android Build Coastguard Worker
'android-review.googlesource.com/2597106'] into androidx-compose-beta-release." into androidx-compose-beta-release
2023-05-30Merge cherrypicks of ['android-review.googlesource.com/2597166', ↵Android Build Coastguard Worker
'android-review.googlesource.com/2597106'] into androidx-compose-beta-release. Change-Id: Id265a685a9af6a4a9b75bb1bf69f28cdf2c2c63b
2023-05-30Merge "Fix unfinished sentence in kdoc for ToggleChip." into ↵Android Build Coastguard Worker
snap-temp-L10400000960929150
2023-05-30Fix unfinished sentence in kdoc for ToggleChip.stevebower
Bug: 283045766 Test: N/A (cherry picked from https://android-review.googlesource.com/q/commit:a70fdbf778beae41b07278ea72f286d02fb6107c) Merged-In: Iddbc986c947c4d19df611e0169e7443a4e018d54 Change-Id: Iddbc986c947c4d19df611e0169e7443a4e018d54
2023-05-30Merge "Use toDisabledColor function in TextButton" into ↵Android Build Coastguard Worker
snap-temp-L10400000960929150
2023-05-30Use toDisabledColor function in TextButtonstevebower
The toDisabledColor extension function correctly handles alpha for those theme colors that already have alpha specified. Bug: 283260965 Test: androidx.wear.compose.material3.test (cherry picked from https://android-review.googlesource.com/q/commit:4a30561f8b345cbb22d283d6579e5659326eb538) Merged-In: Ieeba7e63daead77d5a48284cd7e7edf2b10d88b3 Change-Id: Ieeba7e63daead77d5a48284cd7e7edf2b10d88b3
2023-05-29Merge "Merge cherrypicks of ['android-review.googlesource.com/2590970', ↵snap-temp-L07600000960957258Android Build Coastguard Worker
'android-review.googlesource.com/2592225'] into androidx-compose-beta-release." into androidx-compose-beta-release
2023-05-29Merge cherrypicks of ['android-review.googlesource.com/2590970', ↵Android Build Coastguard Worker
'android-review.googlesource.com/2592225'] into androidx-compose-beta-release. Change-Id: I30fa800a58fecae8d744d3ab9f40c26809b36863
2023-05-29Merge "Fix inconsistency in SwipeToDismissBox contentScrimColor default ↵Android Build Coastguard Worker
parameters" into snap-temp-L30400000960952029
2023-05-29Fix inconsistency in SwipeToDismissBox contentScrimColor default parametershardik
Relnote: Fix inconsistency in SwipeToDismissBox contentScrimColor default parameters Bug: 282937608 Test: Unit tests (cherry picked from https://android-review.googlesource.com/q/commit:46aa4808c0d742d46293f89f9d57f77622d0d05b) Merged-In: I2d70f70ae0d88f5e744808ac9f40546d2a3b6213 Change-Id: I2d70f70ae0d88f5e744808ac9f40546d2a3b6213
2023-05-29Merge "Update baseline profiles rules" into snap-temp-L30400000960952029Android Build Coastguard Worker
2023-05-29Update baseline profiles rulesstevebower
Rules for compose-material now include common code from materialcore library. Bug: 282910490 Relnote: "We have updated the baseline profile rules for compose-foundation and compose-material" Test: N/A (cherry picked from https://android-review.googlesource.com/q/commit:f9fbce4468cf9d46ce623799f39932a1eae2876c) Merged-In: I4725dc48f803b7b9d8a416660f27a61e6bfeaff3 Change-Id: I4725dc48f803b7b9d8a416660f27a61e6bfeaff3
2023-05-29Merge "Merge cherrypicks of ['android-review.googlesource.com/2586505', ↵Android Build Coastguard Worker
'android-review.googlesource.com/2583335', 'android-review.googlesource.com/2586327'] into androidx-compose-beta-release." into androidx-compose-beta-release
2023-05-29Merge cherrypicks of ['android-review.googlesource.com/2586505', ↵Android Build Coastguard Worker
'android-review.googlesource.com/2583335', 'android-review.googlesource.com/2586327'] into androidx-compose-beta-release. Change-Id: I022ef5bf7e831c6bf37dea60ee0f83fd57cf39d7
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 08:12:00 +0000