| commit | d9068341c6f6406f32ac510a7669d64bccea584a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <[email protected]> | Wed May 08 23:23:30 2024 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Wed May 08 23:23:30 2024 +0000 |
| tree | 7f502b44251e47a655d78217b24258d9523ec666 | |
| parent | 85248a55e45158e61a558ca5de32ff536cca5bb1 [diff] | |
| parent | c7d2a9b0f7f27c85a187b05044b5fb8f1281a191 [diff] |
Merge "Add @param tag to EmojiCompat" into androidx-main am: c7d2a9b0f7 Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/3070504 Change-Id: I1216bdd422fbcf3b22a4f602542b4757a7ad4f39 Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/emoji/emoji/src/main/java/androidx/emoji/text/EmojiCompat.java b/emoji/emoji/src/main/java/androidx/emoji/text/EmojiCompat.java index 3a36f25..df23ebc 100644 --- a/emoji/emoji/src/main/java/androidx/emoji/text/EmojiCompat.java +++ b/emoji/emoji/src/main/java/androidx/emoji/text/EmojiCompat.java
@@ -1027,6 +1027,8 @@ /** * @see #setUseEmojiAsDefaultStyle(boolean) * + * @param useEmojiAsDefaultStyle when true, use emoji style presentation for all emojis that + * would be text by default. * @param emojiAsDefaultStyleExceptions Contains the exception emojis which will be still * presented as text style even if the * useEmojiAsDefaultStyle flag is set to {@code true}.