summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
3 daysAdd new aconfig storage dependenciesHEADmastermainTed Bauer
Bug: 328444881 Test: m Change-Id: I883f79700230513e68a8884ef1b3c9e02dedc0b4
3 daysAdd new aconfig storage dependenciesTed Bauer
Bug: 328444881 Test: m Change-Id: I35e36228fdad9dbef7c47ff0533ee727ec3aafb8
11 daysMerge "Migrate Test Targets to New Android Ownership Model" into mainTreehugger Robot
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I952d74a1364d8cd4de45c8d9e1e9bb65416cdbfe Change-Id: I6397373181b868e00d03526f60fa7cd336fd5dbf
2024-02-09Add more missing libc++ includes am: 5116f335f2temp_319669529Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2941045 Change-Id: I952d74a1364d8cd4de45c8d9e1e9bb65416cdbfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I973bde5b73a9db4461b26fcfee1a41b09a6e1bdb
2024-01-31Add more missing libc++ includesTomasz Wasilczyk
Bug: 175635923 Test: m checkbuild (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1eb35b750df7bdfbf7706d899ad3c28d8732abb7) Merged-In: I58e93d1c645a280add075a07709314b1f3f1eb3a Change-Id: I58e93d1c645a280add075a07709314b1f3f1eb3a
2024-01-17Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: Icfd0ce32db4f770bd1b0c5f164c4c87e846ae1d9 Change-Id: I97001fa86dc3f6af805ebf43156e941b0e1aa75a
2024-01-12Add missing libc++ includes am: 27b3545620Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2902171 Change-Id: Icb1f1279f12f28c209cb61c87b9851fbe664f91b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-09Add missing libc++ includesTomasz Wasilczyk
Bug: 175635923 Test: m MODULES-IN-frameworks-minikin Change-Id: I7e62e4e77750b72abe90e30cb297b3fc3fe13c80
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-11-30Merge "Refactoring: pull out script splitter with unit test" into mainSeigo Nonaka
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-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-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-02Merge "Cache the layout result if the font feature is specified" into mainSeigo Nonaka
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-25Add LineBreakWordStyle::Auto and LineBreakStyle::Auto to minikinSeigo Nonaka
Bug: 280005585 Test: minikin_tests Change-Id: Ib2810ff27f6cf3ff38b8b73703704ff823902a8f
2023-10-11Merge "Add method that returns reference extent for locale" into mainSeigo Nonaka
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-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-03Merge "Simplify feature flags" into mainTreehugger Robot
2023-10-01Simplify feature flagsSeigo Nonaka
Bug: N/A Test: TreeHugger Change-Id: I386efb692907835658a0772c25e91a6eb3b622da
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-20Add trace point to the bounding box calculationSeigo Nonaka
Bug: 63938206 Test: N/A Change-Id: I3d795797ae9b30e8cedd1ef499fb3b3c41a847bb
2023-09-12Merge "Add no hyphenation into style run" into mainSeigo Nonaka
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 313ff6f63c -s ours ↵Xin Li
am: 8bc8c0bc08 -s ours am: 7f8df6b63a -s ours am: a374bd332c -s ours am skip reason: Merged-In I78ca8f4144fccc0b21f153d44b2dde13f7c8433e with SHA-1 6e324dec2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/24182712 Change-Id: I65d709cdbb3505be7843769643144a041fbb352e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 313ff6f63c -s ours ↵Xin Li
am: 8bc8c0bc08 -s ours am: 7f8df6b63a -s ours am skip reason: Merged-In I78ca8f4144fccc0b21f153d44b2dde13f7c8433e with SHA-1 6e324dec2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/24182712 Change-Id: I6550723783bd545b36b529f8acbaa12c993b081b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 313ff6f63c -s ours ↵Xin Li
am: 8bc8c0bc08 -s ours am skip reason: Merged-In I78ca8f4144fccc0b21f153d44b2dde13f7c8433e with SHA-1 6e324dec2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/24182712 Change-Id: I0277a1ea6231d4f2ede28a60b0614ce422c3aa0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 13:04:09 +0000