summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-01-16Merge "Snap for 11315376 from c6db8056b21a2d1ef9ad09a0a177447560190571 to ↵androidx-wear-tiles-releaseAndroid Build Coastguard Worker
androidx-wear-tiles-release" into androidx-wear-tiles-release
2024-01-16Snap for 11315376 from c6db8056b21a2d1ef9ad09a0a177447560190571 to ↵Android Build Coastguard Worker
androidx-wear-tiles-release Change-Id: I5dbc45035fc471467ac1b0586b56f358c8072c08
2023-12-21Merge "Suppress JDK 21 warning about Java 8 being obsolete" into androidx-mainandroidx-test-uiautomator-releaseandroidx-graphics-releaseTreehugger Robot
2023-12-14Suppress JDK 21 warning about Java 8 being obsoleteAurimas Liutikas
Test: ./gradlew :noto-emoji-compat-flatbuffers:compileJava ^ no warnings with JDK 21 Change-Id: Ib181141bdda119e09017bff853acf38d508541df
2023-12-04Merge "Update emoji-compat to Emoji 15.1, revision 2.042" into androidx-mainHalil Ozercan
2023-11-30Update emoji-compat to Emoji 15.1, revision 2.042Halil Ozercan
Test: :emoji2:emoji2 Test: Manually confirmed in support-emoji-demos Change-Id: Ic37ee4ff39691e33c61bef8ea0bcab2753033c24
2023-11-29Merge "Update emoji-compat to Unicode 15.1" into androidx-mainHalil Ozercan
2023-11-28Update emoji-compat to Unicode 15.1Halil Ozercan
Test: :emoji2:emoji2 Test: Manually confirmed in support-emoji-demos Change-Id: I46ff23855cd13272e8c33c2b76456ccb4ce92047
2023-07-19Merge "Snap for 10525232 from 8f6cec6ca74bbbaf4a728f9965f124ff5b87f08f to ↵Android Build Coastguard Worker
androidx-wear-tiles-release" into androidx-wear-tiles-release
2023-07-19Snap for 10525232 from 8f6cec6ca74bbbaf4a728f9965f124ff5b87f08f to ↵Android Build Coastguard Worker
androidx-wear-tiles-release Change-Id: If08f99f2fdf6001e5a4190b0c03329a672a1acfa
2023-01-17Merge "Revert "Revert "Bump emojicompat bundled font to 15""" into androidx-mainandroidx-window-extensions-core-releaseandroidx-wear-wear-tooling-preview-releaseandroidx-privacysandbox-ads-releaseandroidx-health-releaseandroidx-credential-releaseandroidx-core-performance-releaseSean McQuillan
2023-01-17Revert "Revert "Bump emojicompat bundled font to 15""Sean McQuillan
This reverts commit 51bffe5fa6cef4a8d6acebae1561498f53948145. Reason for revert: New font with fix Change-Id: I0ef5397066d338a81fcaa4793da54da11681b438
2023-01-04Merge "Revert "Bump emojicompat bundled font to 15"" into androidx-mainTreehugger Robot
2023-01-03Revert "Bump emojicompat bundled font to 15"Sean McQuillan
This reverts commit dc835085d183b117e4dd5786c09252d762d27aec. Reason for revert: Metadata is malformed Change-Id: I1de72f31fd2c5073c50258e6b2a23a47054d275d
2022-12-16Merge "Bump emojicompat bundled font to 15" into androidx-mainSean McQuillan
2022-12-15Bump emojicompat bundled font to 15Sean McQuillan
Take 2, now with correct CBDT header Added fetch script that validates font on ingestion Test: ./gradlew :e2:e2-bun:cAt // api 22 Change-Id: I1ed92b995e7960bdb1ac0d13757c7b7d62475335
2022-12-14Merge "Revert "Add emoji 15 font to bundled."" into androidx-mainTreehugger Robot
2022-12-14Revert "Add emoji 15 font to bundled."Sean McQuillan
This reverts commit 7f787ae558d8223c4693e0c717a8fbcba4c7a759. Reason for revert: reports of not loading on API 23 Change-Id: I57b6d5cdd92362df099d3537b658f7ce66362e47
2022-12-09Merge "Add emoji 15 font to bundled." into androidx-mainSean McQuillan
2022-12-05Add emoji 15 font to bundled.Sean McQuillan
Test: manual support-emoji-demos Change-Id: Idbf536e418fc684e41ec3ef440d673bb4b9c0f24
2022-08-01Merge "Target Java 8 for emoji-compat-flatbuffers" into androidx-mainAurimas Liutikas
2022-08-01Target Java 8 for emoji-compat-flatbuffersAurimas Liutikas
JDK 17 no longer supports targeting Java 7, move to 8 to match the rest of the androidx libraries. Test: ./gradlew jar (using jdk17) no warnings Change-Id: I502e697d473295d8da288a1245f803de917a143e
2022-08-01Merge "Snap for 8890757 from ca62054364165fa24819c8e54a0161bd171dfb0c to ↵Android Build Coastguard Worker
androidx-wear-tiles-release" into androidx-wear-tiles-release
2022-08-01Snap for 8890757 from ca62054364165fa24819c8e54a0161bd171dfb0c to ↵Android Build Coastguard Worker
androidx-wear-tiles-release Change-Id: I3990e9c890049552f1f8c7f7ac5b134f8868d502
2022-07-26Merge "Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into ↵Alan Viverette
merge_platform_dev" into androidx-main
2022-07-22Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into ↵Alan Viverette
merge_platform_dev Change-Id: I19d3f418d0a1e7d15593fa610d0ea1293860a581
2021-12-02Merge "Update NotoColorEmojiCompat to 2.034 (Emoji 14)" into androidx-main ↵androidx-platform-dev-tempTreehugger Robot
am: f1a355d8d0 Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1908070 Change-Id: I8bfab8ca7b8f636f4f686e34866388ebba21290f
2021-12-02Merge "Update NotoColorEmojiCompat to 2.034 (Emoji 14)" into androidx-mainandroidx-metrics-releaseandroidx-customview-customview-poolingcontainer-releaseandroidx-core-core-splashscreen-releaseTreehugger Robot
2021-12-01Update NotoColorEmojiCompat to 2.034 (Emoji 14)Seigo Nonaka
Bug: 208665210 Test: ./gradlew :emoji2:emoji2-bundled:cAT :emoji:emoji-bundled:cAT Change-Id: I9e4687f5cf87224faaa55ab9955e509087eaf71e
2021-07-14Merge "Update EmojiCompat font to 2.028" into androidx-main am: be8a7617daTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1764837 Change-Id: I6abb3773da4ddba18ed6f2f1419620c83d98fee7
2021-07-14Merge "Update EmojiCompat font to 2.028" into androidx-mainandroidx-wear-wear-remote-interactions-releaseandroidx-wear-wear-phone-interactions-releaseandroidx-wear-wear-ongoing-releaseandroidx-resourceinspection-releaseTreehugger Robot
2021-07-13Update EmojiCompat font to 2.028Seigo Nonaka
Bug: 193555936 Test: ./gradlew :emoji2:emoji2-bundled:cAT :emoji:emoji-bundled:cAT Change-Id: Iecda3acf5c82bfb75c98c11b17de2015b55ec3ea
2021-05-06Update NotoColorEmoji.ttfSeigo Nonaka
Bug: 186700258 Test: ./gradlew :e2:e2-bundled:cAT :emoji:cAT Change-Id: I016e2072fa71225600e0562d71ead664314696ce
2021-05-06[automerger skipped] Merge "Update NotoColorEmoji.ttf" into androidx-main ↵Seigo Nonaka
am: 4960963e53 -s ours am skip reason: skipped by user nona Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1692807 Change-Id: I8e54164f095674b870e031a50e4422ee7c0bdc8e
2021-05-05Merge "Update NotoColorEmoji.ttf" into androidx-mainSeigo Nonaka
2021-04-30Update NotoColorEmoji.ttfSeigo Nonaka
Bug: 186700258 Test: ./gradlew :e2:e2-bundled:cAT :emoji:cAT Change-Id: I016e2072fa71225600e0562d71ead664314696ce
2021-03-22Merge "Create new emoji-compat-flatbuffers module" into androidx-main am: ↵Sean McQuillan
6438f2d74a Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1646614 Change-Id: I89066db6ffb31e9a4ccfc87901f95b10b046d352
2021-03-22Merge "Create new emoji-compat-flatbuffers module" into androidx-mainSean McQuillan
2021-03-19Create new emoji-compat-flatbuffers moduleSean McQuillan
This module only contains Apache 2 licensed flatbuffers code that previously lived next to OFL and UNICODE licensed code in emoji-compat. By extracting this, we can link the flatbuffers without having to add notification of OFL and UNICODE in the module depending on these flatbuffer definitions. Update createfont.py to point to this new module, all files are validated, and java src is moved to this new module. Note: This change manually reverts the generated font since we are missing source files for a reproducable build at time of merge. To be addressed in followup CL. Test: ./createfont.py {path}/NotoColorEmoji.ttf {path}/unicode ../emoji-compat-flatbuffers Bug: b/178035684 Change-Id: I696debd751ad853c126a7b3d4d62db57db8cbc7d
2021-03-09Merge "Create emojicompat font w/new syringe. Note that there are no new ↵Siyamed Sinir
sequences so emoji metadata didn't change" into androidx-main am: bac26d88f5 Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1607534 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ec855bc45b75cd72db34fcf5f4e5c95a45ff9a5
2021-03-08Merge "Create emojicompat font w/new syringe. Note that there are no new ↵Siyamed Sinir
sequences so emoji metadata didn't change" into androidx-main
2021-02-26Create emojicompat font w/new syringe. Note that there are no new sequences ↵Rod S
so emoji metadata didn't change Test: emulator test app; confirmed native emoji show old syringe and emojicompat shows new Change-Id: I503f7731d34208733b68f044ba72716226f91f5c
2021-01-12Merge "Update EmojiCompat font to Emoji 13.1" into androidx-main am: 755fc3c197Nyshadh Reddy Rachamallu
Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1543578 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1e1ffdf5228e171e6380783796cc3186e518583
2021-01-12Merge "Update EmojiCompat font to Emoji 13.1" into androidx-mainNyshadh Reddy Rachamallu
2021-01-08Update EmojiCompat font to Emoji 13.1Nyshadh Reddy Rachamallu
Test: ./gradlew :emoji:test (SDK 23) Test: ./gradlew :emoji:cAT (SDK 23) Test: manual in the sample app (SDK 23) bug: 174872952 Change-Id: I840066caf18760d0f77ed8f13c8890c04014129e
2020-12-09Merge "Merge "Migrate existing jarjar plugin users to shadow plugin" into ↵Automerger Merge Worker
androidx-master-dev am: 95558368c6" into androidx-main am: 15a16b348d Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1499104 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iddc0cb82b92a0f36c5cf5bc25f33cc8e84ff64a6
2020-11-19Merge "Merge "Migrate existing jarjar plugin users to shadow plugin" into ↵Automerger Merge Worker
androidx-master-dev am: 95558368c6" into androidx-main
2020-11-19Merge "Migrate existing jarjar plugin users to shadow plugin" into ↵Jeff Gaston
androidx-master-dev am: 95558368c6 Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1499104 Change-Id: Ic8b81e0ba2beed9bc085588c896fa3cf60c8f061
2020-11-19Merge "Migrate existing jarjar plugin users to shadow plugin" into ↵androidx-master-devJeff Gaston
androidx-master-dev
2020-11-13Migrate existing jarjar plugin users to shadow pluginAurimas Liutikas
Set up a new BundleInsideHelper to extract common parts of bundling a jar inside an AAR or JAR and use it in projects that had custom code for this. Additionally, migrate away from using JarJar plugin as it uses old ASM that is not compatible to the latest AGP. Test: ./gradlew createArchive Change-Id: Ic82417e0b57632e06eaed73e18103977f908fe34
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 15:08:24 +0000