summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-15Snap for 11220357 from 2ddfc05c281623c991753d3c04374e60d9431743 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: Icaa5d8de006484f5117c09287e14a16de435d9a8
2023-12-13Fix build for macOSJerome Gaillard
On macOS, size_t is neither uint32_t nor uint64_t. So compilation fails because no update method corresponds. This casts the result of vector::size to uint32_t to fix this, just as was done for strings in updateString. Bug: N/A Test: N/A Change-Id: Icfd0ce32db4f770bd1b0c5f164c4c87e846ae1d9
2023-12-01Snap for 11162593 from e68bf31aedbee180f3a4ce0073937cfc1fdf0b4b to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I0a5d7bee3789230fefb3d32e40b8d44a520fb54b
2023-11-30Merge "Refactoring: pull out script splitter with unit test" into mainSeigo Nonaka
2023-11-18Snap for 11117647 from b86a47f7aaae91efd5176e79367bc926301bb388 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ib7f8563a920360eac6fb85881b2066d2132e06f4
2023-11-17Merge "Fallback to non-variant match if nothing matches" into mainSeigo Nonaka
2023-11-17Fallback to non-variant match if nothing matchesSeigo Nonaka
Bug: 310117531 Test: atest CtsGraphicsTestCases CtsTextTestCases CtsWidgetTestCases Change-Id: I574b641e50e8f2bc03c7490c0199697e79d81aa2
2023-11-17Snap for 11111096 from dbc3c80f3df06d449fdc22d04b84038fdfff9f2a to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Idb090795776dea09077e1926d01d0bbc724103c2
2023-11-16Snap for 11104212 from 66c35a4ecdc12be8ba01319920236450a7f410eb to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I31ca38a0a5251cc8d8096bab6466ca8afc3615ee
2023-11-13[2nd attempt] Cache the layout result if the font feature is specifiedSeigo Nonaka
The previous performance regression was likely feature flag read in performance critical path. Now it is cached and should not have a big impact to the performance. Before this patch, the layout is not cahced if the font feature settings are specified. This CL caches the layout even if the font feature is specifid. This is necessary because the Java layer will use font feature settings for disabling ligature if the inter word justification is specified. Bug: 283193133 Test: minikin_tests Change-Id: I3391296d081275e016fa5208cea010b2f0e6f1f2
2023-11-13Add new flag for inter character justificationSeigo Nonaka
Bug: 283193133 Test: N/A Change-Id: I6340f980a6554e6bf1f86d570ab063e712d11819
2023-11-13Cache the flag valueSeigo Nonaka
Accessing flags in native is costly and should not be done during layout calculation. Bug: 308950033 Test: atest StaticLayoutGetOffsetForHorizontalPerfTest Change-Id: I72ec6b3a531eff593311f2142d40351affcc638b
2023-11-07Refactoring: pull out script splitter with unit testSeigo Nonaka
The script transition point will be used for other places, so pull out the script splitter from LayoutCore.cpp with unit tests. Bug: 283193133 Test: minikin_tests Change-Id: Icd9679d334815a6c864f27d0e0222186d514ff81
2023-11-07Snap for 11059422 from d27148d9ed3d653b6e8d95a769de0150be1104e9 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Id62a8fe7e46a2db98cdfa1e14b98c47cb555b454
2023-11-06Merge "Revert "Cache the layout result if the font feature is specified"" ↵Peter Kalauskas
into main
2023-11-06Revert "Cache the layout result if the font feature is specified"Seigo Nonaka
Revert submission 25211873-font_feature_cache Reason for revert: accessing feature flag in native causes the peformance regression. Reverted changes: /q/submissionid:25211873-font_feature_cache Change-Id: I9f9b144196e37d0da815886a3126f99477e88675
2023-11-03Snap for 11044623 from a5015b9ce851de22d7108f2b5e1ac17b9e822dbb to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ie64bf51e4ad7bc2c9befffd5a3035427c48f9f21
2023-11-02Merge "Cache the layout result if the font feature is specified" into mainSeigo Nonaka
2023-10-31Snap for 11025555 from 180fe1abbbdffedd1a67f33e6d4a140b311d50d4 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I57b11332bb13f93ca0dab01cdd2f33b483fd80d0
2023-10-30Adjust with changes in libxml2 upgrade am: 415112fea8 am: 6c6c911b02 am: ↵Sadaf Ebrahimi
5549d58e5e Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004 Change-Id: I6521aeb13827761c1267de82b5e834de7bc8ba24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Adjust with changes in libxml2 upgrade am: 415112fea8 am: 6c6c911b02Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004 Change-Id: I74d535acd2bb8ed30b845960c8217a421c37b692 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Adjust with changes in libxml2 upgrade am: 415112fea8Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004 Change-Id: I996f7c637c1aa24e93674745041b4fee53789397 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Adjust with changes in libxml2 upgrade am: 415112fea8 am: 9aff4f0e90 am: ↵Sadaf Ebrahimi
13608e33c8 Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004 Change-Id: Ida9b88a1caf5817e7ad26020378b937c4ee2f43f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Adjust with changes in libxml2 upgrade am: 415112fea8 am: 9aff4f0e90Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004 Change-Id: I98f81ad4664a0489f52aa955ad2c1705645698d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Adjust with changes in libxml2 upgrade am: 415112fea8Sadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2773004 Change-Id: I386c23965966e8b1d487a74d54eb23772f0429ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-29Cache the layout result if the font feature is specifiedSeigo Nonaka
Before this patch, the layout is not cahced if the font feature settings are specified. This CL caches the layout even if the font feature is specifid. This is necessary because the Java layer will use font feature settings for disabling ligature if the inter word justification is specified. Bug: 283193133 Test: minikin_tests Change-Id: If54c448d3f496b3323e2d3177803b815f433b65c
2023-10-26Adjust with changes in libxml2 upgradeSadaf Ebrahimi
Bug: http://b/307806447 Test: TreeHugger Change-Id: I7cf59b4329fd0e14fb44bd27b91d1fa0b668e1c1
2023-10-26Snap for 11005173 from fd8349e7a33b3db583e4ea49714c585d282fea52 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I3a78623be3613bab93edc13ef0e2f29d8e7fffa9
2023-10-25Add LineBreakWordStyle::Auto and LineBreakStyle::Auto to minikinSeigo Nonaka
Bug: 280005585 Test: minikin_tests Change-Id: Ib2810ff27f6cf3ff38b8b73703704ff823902a8f
2023-10-12Snap for 10934304 from 308a35adb98cc428f0a2ab022958d8fcb1710bd0 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Iee4562377687df906247318e83f2088faebc0404
2023-10-11Merge "Add method that returns reference extent for locale" into mainSeigo Nonaka
2023-10-11Snap for 10929702 from 79648373818a752da0889ebbb155b0aac1ba4cbc to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I6ed99df174057d21b3f5c55e4f9bbeabc615a5de
2023-10-11Add method that returns reference extent for localeSeigo Nonaka
Bug: 303326708 Test: atest PaintFontMetricsForLocaleTest Change-Id: I1fe2a475aed21a58f69e33ab91320dea77f463d5
2023-10-10Merge "Add support of no break style" into mainSeigo Nonaka
2023-10-07Snap for 10917888 from 8f53bf73fc08a1fba55d2ae0edd8846688ca61ea to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I036e048110bb43c3ebc9a15d7404c90f17d41d20
2023-10-07[automerger skipped] Merge Android 14 am: 9106dcd9bf -s ours am: 8268021caa ↵Xin Li
-s ours am: 37482976a0 -s ours am: a405757646 -s ours am: 6995304e57 -s ours am skip reason: Merged-In I7eae75f9461daebeabf1f78fb2905412c108bc60 with SHA-1 4920747bfd is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2776021 Change-Id: I231bda6e3f4a3b842950abe72aede1a92fa2c375 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9106dcd9bf -s ours am: 8268021caa ↵Xin Li
-s ours am: 37482976a0 -s ours am: a405757646 -s ours am skip reason: Merged-In I7eae75f9461daebeabf1f78fb2905412c108bc60 with SHA-1 4920747bfd is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2776021 Change-Id: I9b97d88d949eedfca11f036720f16643591b4579 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9106dcd9bf -s ours am: 8268021caa ↵Xin Li
-s ours am: 37482976a0 -s ours am skip reason: Merged-In I7eae75f9461daebeabf1f78fb2905412c108bc60 with SHA-1 4920747bfd is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2776021 Change-Id: Ie1911aad3812ce76bf13c3efeaa2d69cbd343b55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9106dcd9bf -s ours am: 8268021caa ↵Xin Li
-s ours am skip reason: Merged-In I7eae75f9461daebeabf1f78fb2905412c108bc60 with SHA-1 4920747bfd is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2776021 Change-Id: Ic275442fa0f93fe5a1430fa4a9833c634e0e25ee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 9106dcd9bf -s oursXin Li
am skip reason: Merged-In I7eae75f9461daebeabf1f78fb2905412c108bc60 with SHA-1 4920747bfd is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2776021 Change-Id: Ib0ea00cc73cd4cde1e540d96c870390214565e7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I7eae75f9461daebeabf1f78fb2905412c108bc60 Change-Id: I39cf449d3898d1b979e0be09d117835912c11557
2023-10-05Add support of no break styleSeigo Nonaka
Bug: 283193586 Test: minikin_tests Test: atest StaticLayoutLineBreakingNoBreakSpanTest Change-Id: I20aed04583198ce1cc4c79a74c594531f6f6c00c
2023-10-04Snap for 10897809 from 86acf0d3f37a7e70556791d8cf65e089c62d0e2b to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I367f40265f254e9bd1a8e77b6013675c3878e672
2023-10-03Merge "Simplify feature flags" into mainTreehugger Robot
2023-10-01Simplify feature flagsSeigo Nonaka
Bug: N/A Test: TreeHugger Change-Id: I386efb692907835658a0772c25e91a6eb3b622da
2023-09-30Snap for 10884074 from 211125ea3a4691ba68026b744531d5fdcc8ff32d to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ie2dd6572618acaa62594a5ba9bbb7e9d94bd6a09
2023-09-29Merge "Use androidx Flaky annotation for device tests." into mainAnna Zhuravleva
2023-09-28Use androidx Flaky annotation for device tests.Anna Zhuravleva
Platform_testing flaky annotation is for host side tests and restricted, device tests should use androidx annotation. Bug: 293837621 Test: build Change-Id: Ica09d0cd1132600b5f70f620fdd0ccba0c812ce7
2023-09-27Put phrase->strict fallback behind the flagSeigo Nonaka
Bug: 281970875 Test: N/A Change-Id: I99230795a0f7db88316137c6906d85d1d366a00d
2023-09-23Snap for 10851067 from f50b62934915cf20e0b8fb157839376f4750f0de to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ib44245824c39c5c21d2abead58509889d6a557b9
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 22:18:38 +0000