• Home
  • History
  • Annotate
  • only in /frameworks/support/emoji/core/src/
History log of /frameworks/support/emoji/core/src/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
52aac7e79f150655bccf79541199ab9cce2bc04a 06-Jun-2017 Siyamed Sinir <siyamed@google.com> Fix EmojiCompat deprecation docs error

Test: ./gradlew generateDocs -PofflineDocs=true

Bug: 62227782
Change-Id: Iab6eaf46c79e13a2ce23941a7a4fe539b6df64f2
ndroid/support/text/emoji/EmojiCompat.java
9feaf46005af807098ba1d26fb36d6d1d2a5a7f2 06-Jun-2017 Siyamed Sinir <siyamed@google.com> Merge "Add @CheckResult EmojiCompat.process methods" into oc-support-26.0-dev
34f638e630f75357a5f706f387ee9099c97af26b 06-Jun-2017 Siyamed Sinir <siyamed@google.com> Deprecate LOAD_STATE_SUCCESS and FAILURE

Introduce as LOAD_STATE_SUCCEEDED and LOAD_STATE_FAILED instead.

Test: ./gradlew support-emoji:connectedAndroidTest

Bug: 62227782
Change-Id: I13625e5d322805be03d286e14ab7d2b02cdb078e
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/widget/EmojiInputFilter.java
ndroid/support/text/emoji/widget/EmojiTextWatcher.java
ndroid/support/text/emoji/widget/EmojiTransformationMethod.java
22dfa0c8641bc8f2d3fb084f9d2cbe1beb963d8a 06-Jun-2017 Siyamed Sinir <siyamed@google.com> Add @CheckResult EmojiCompat.process methods

Test: No tests
Bug: 62227782
Change-Id: If0d98ebe7ceb36a70b132bb8e20ecaa6b1a06a64
ndroid/support/text/emoji/EmojiCompat.java
fdc5f7bbb0e22b5d6e400327d9d4b732b07dec75 26-May-2017 Siyamed Sinir <siyamed@google.com> Add replaceStrategy param to EmojiCompat.process()

Bug: 37626597

Test: New tests added
./frameworks/support/gradlew -p frameworks/support \
support-emoji:connectedAndroidTest

Change-Id: I5a4523c6638e8314ded881c2d6e5f49c597ce8ac
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/EmojiProcessor.java
8346a9a10895008f08f50969689a1ce16fbd577c 10-May-2017 Seigo Nonaka <nona@google.com> Remove FontsContractInternal

This CL includes:
- Rewrite FontRequestEmojiCompatConfig with FontsContractCompat
- Update tests to reflects the implementation.
- Remove FontsContractINternal, FontResult, and related tests.

Bug: 37493347
Test: ./gradlew support-compat:connectedDebugAndroidTest
on API 16, 17, 18, 19, 21, 22, 23, 24, 25, O
Test: ./gradlew support-emoji:connectedDebugAndroidTest
on API 16, 17, 18, 19, 21, 22, 23, 24, 25, O
Test: ./gradlew support-appcompat-v7:connectedDebugAndroidTest
on API 16, 17, 18, 19, 21, 22, 23, 24, 25, O

Change-Id: Iabcca156021af73651eb3c804f640a25951ca91f
ndroid/support/text/emoji/FontRequestEmojiCompatConfig.java
fc857452283b38dfbac9ca023a77a8cf8b8c5599 09-May-2017 Seigo Nonaka <nona@google.com> Refactoring DL Font - Extract thread model from TypefaceCompat.

- Remove TypefaceCompatBaseImpl.create
- Decouple BackgroundThread from TypefaceCompat and put it
FontsContractCompat.
- Extract self destructive handler thread functionality to
SelfDestructiveThread with tests.

Bug: 37493347
Test: ./gradlew support-compat:connectedDebugAndroidTest
on API 16, 17, 18, 19, 21, 22, 23, 24, 25, O
./gradlew support-emoji:connectedDebugAndroidTest
on API 16, 17, 18, 19, 21, 22, 23, 24, 25, O

Change-Id: I577fcb02fe2e266fa88b16fbe4788228dfb96d11
ndroid/support/text/emoji/FontRequestEmojiCompatConfig.java
e8dd649c034eb9965caaec40a2de8e5f972ef4c1 08-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove TypefaceHolder and use TextView.setTypeface(Typeface, int)" into oc-dev
d6e62a9d119a07f4d2bd686f357d8a667085fe71 05-Apr-2017 Siyamed Sinir <siyamed@google.com> Add maxEmojiCount attribute to EmojiEditText

Test: Added tests
./gradlew support-emoji:connectedAndroidTest

Bug: 36013851
Change-Id: I6c12b9619f416283d88c965a1355bbeaf9ebc87a
ndroid/support/text/emoji/widget/EditTextAttributeHelper.java
ndroid/support/text/emoji/widget/EmojiEditText.java
ndroid/support/text/emoji/widget/EmojiEditTextHelper.java
ndroid/support/text/emoji/widget/EmojiTextWatcher.java
a55160adc4ac7481c48512c7c146e7875a380021 02-May-2017 Seigo Nonaka <nona@google.com> Remove TypefaceHolder and use TextView.setTypeface(Typeface, int)

Looks like TextView.setTypeface(Typeface, int) does a good job for
fake bold/italic. No need to propagate weight/italic information
and call TextView.setTypeface(Typeface, int) instead.

This CL fixes invalid skew angle happens on API 21 or later.

Known Issues:
- FakeItalic is not working even if the text view style has italic bit.
(Happens on API 15, 16, 17, 18, 19)
- FakeBold/FakeItalic is used for StyleSpan.
(Happens on all API level)
- Still not working on API 15.

Bug: 37783900
Test:./gradlew support-compat:connectedDebugAndroidTest
Test: ./gradlew support-emoji:connectedDebugAndroidTest
Test: Saw manually the rendered text. (Screenshot attached in issue)

Change-Id: Icf496a8d44e37e344262a52ca2936583d768a220
ndroid/support/text/emoji/FontRequestEmojiCompatConfig.java
9094130ddddd944c2f1dd03044baf1bd86442b59 30-Apr-2017 Siyamed Sinir <siyamed@google.com> Merge changes from topic 'emojicompat_api19' into oc-dev

* changes:
Update tests for EmojiCompat on pre 19
Make EmojiCompat no-op pre19
f69ef36b9ff270c87e41177551ef4692f9aff965 28-Apr-2017 Seigo Nonaka <nona@google.com> Make Font Resources XML working on Android N or before device.

This addresses several issues:

- API 16 to API 25
There are two main issues.
-- AssetManager failed to open file by path name.
Fixed by using Resources.openRawResource instead of
AssetManager.openNonAssetFd.

-- TextView's style is ignored.
Before API 26, there is no way to create Typeface from multiple font
files. If Typeface is created from multiple font files, TextView will
select correct font based on style information of them.
However, this is impossible on API 25 or before. So select best match
font from given list and create Typeface with it.

At the same time, there is a concept "fakeBold" and "fakeItalic" on
Android. If even the best matched Typeface is not usable for requested
style, TextView makes bold/italic glyph with transforming available
glyph. Since we does font selection by ourselves, needs to set fake
bold/italic by manual too.

- API 16 - API 19
Styled typeface can be created from another Typeface like as follows.
Typeface boldTypeface = Typeface.create(baseTypeface, Typeface.BOLD);
The passed style information can be retrieved by Typeface.getStyle()
but this doesn't return real value on API 19 or before. Thus, introduce
TypefaceHolder to hold actually using weight/italic information.

Known Issues:

- API 15 or before
Still not working even after this patch. TypedArray returns false for
hasValue with R.styleable.TextAppearance_android_fontFamily.

- API 21 - API 25
The skew angle is sharper.

Bug: 37754362
Test: ./gradlew support-compat:connectedDebugAndroidTest passes on
API 15,16,17,18,19,21,23,25,26
Test: Test App attached issue 37754362 show the same result on
API 16,17,18,19,21,23,25
except for fake italic angle.
Screenshots is available on issue tracker.

Change-Id: I6bd615774be55981289f5f3b88f3d71fa1b39014
ndroid/support/text/emoji/FontRequestEmojiCompatConfig.java
56489fe7b61a3dd6d70fc7ff7a4e5b129773797c 27-Apr-2017 Seigo Nonaka <nona@google.com> Move FontRequest from graphics.font to provider pacakge.

This moving was done in framework by
I0eb501844247c2f07eaa1fc7a71f72e404888b5b

Bug: 37326126
Test: ./gradlew support-emoji:connectedDebugAndroidTest
Test: ./gradlew support-compat:connectedDebugAndroidTest
Change-Id: Ibbc8f5d685f86ef6983eea40f6ca4d6301d8d52a
ndroid/support/text/emoji/FontRequestEmojiCompatConfig.java
77b5c5b734f9f665577d1e3d178615db43ae1d4f 27-Apr-2017 Siyamed Sinir <siyamed@google.com> Make EmojiCompat no-op pre19

Test: CL I642cf9a96f0f5677a16f933dcf1581fffba7c931

Bug: 35811035
Change-Id: I1016dc1b469af0133e65156734fd32375811231f
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/EmojiMetadata.java
ndroid/support/text/emoji/EmojiProcessor.java
ndroid/support/text/emoji/EmojiSpan.java
ndroid/support/text/emoji/FontRequestEmojiCompatConfig.java
ndroid/support/text/emoji/MetadataListReader.java
ndroid/support/text/emoji/MetadataRepo.java
ndroid/support/text/emoji/TypefaceEmojiSpan.java
ndroid/support/text/emoji/widget/EmojiButton.java
ndroid/support/text/emoji/widget/EmojiEditText.java
ndroid/support/text/emoji/widget/EmojiEditableFactory.java
ndroid/support/text/emoji/widget/EmojiInputConnection.java
ndroid/support/text/emoji/widget/EmojiInputFilter.java
ndroid/support/text/emoji/widget/EmojiKeyListener.java
ndroid/support/text/emoji/widget/EmojiTextView.java
ndroid/support/text/emoji/widget/EmojiTextWatcher.java
ndroid/support/text/emoji/widget/EmojiTransformationMethod.java
ndroid/support/text/emoji/widget/SpannableBuilder.java
0b03693667d95d2202dfbb24866665ff061acce1 19-Apr-2017 Seigo Nonaka <nona@google.com> Hide TypefaceCompat and introduce FontsContractCompat instead.

This change brings the supportlib implementation of Downloadable
Fonts in sync with the recent changes in the framework.

TypefaceCompat.create is kept but hidden to deal with xml layout font
loading, as is in the framework atm.

The API26 implementation still points to API24, as framework APIs are
not final yet.

Bug: 35381428
Test: support-compat:connectedDebugAndroidTest
Change-Id: I4d73d7a547a0d9b79c4b7158d431a573b80417f3
ndroid/support/text/emoji/FontRequestEmojiCompatConfig.java
176b7a517ad28a8cffc8cc3307b6ce2c42a36cc9 15-Apr-2017 Siyamed Sinir <siyamed@google.com> Use font from external/noto-fonts/emoji-compat

Update EmojiCompat modules to reference the following files in
external/noto-fonts/emoji-compat
- NotoColorEmojiCompat.ttf
- emojis.txt (used for testing)
- flatbuffers jar
- java files used to read binary FlatBuffers metadata in the font

Test:
- ./gradlew support-emoji:connectedAndroidTest to see that the code works.
- ./gradlew uploadArchives to see that AAR’s are generated
- Inspected the AAR files to see that they contain font and the license
files.

Bug: 36385743
Change-Id: Ib389e8abfb688af50aa1d40b26e6e455e3a50b99
ndroid/support/text/emoji/flatbuffer/MetadataItem.java
ndroid/support/text/emoji/flatbuffer/MetadataList.java
484205f290d5cc989074248f876f72d10000eba1 06-Apr-2017 Siyamed Sinir <siyamed@google.com> Integrate TypefaceCompat into EmojiCompat

Test: Added a test
./gradlew support-emoji:connectedAndroidTest

Bug: 37038711
Change-Id: Ib2b28c304f1a5d92dc51a150ee55f0d7bb6d720d
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/FontRequestEmojiCompatConfig.java
ndroid/support/text/emoji/MetadataListReader.java
a03c41155d5cc859cb8c0761a6e47c667593dd69 04-Apr-2017 Siyamed Sinir <siyamed@google.com> Temporarily accept ‘emji’ for the meta tag name

Test: gradle support-emoji:connectedAndroidTest

Bug: 36872180
Change-Id: I3f404f469371bce9e0f500cbca350bdaa0dc5033
ndroid/support/text/emoji/MetadataListReader.java
0bd2e404e8efbc6408e2bea7531b858bce639b03 30-Mar-2017 Siyamed Sinir <siyamed@google.com> Remove EmojiCompat.Config.mMaxEmojiPerText

This CL removes the global config option for maximum EmojiSpan count and
adds a parameter to process() function.

Test: New tests added
gradle support-emoji:connectedAndroidTest

Bug: 36013851
Change-Id: I0de8072bf94bc59eaf265f01fae05e54b13e05fa
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/EmojiProcessor.java
b30ca93d6dae4a1249a758caa7dae8a51afaf0ae 29-Mar-2017 Siyamed Sinir <siyamed@google.com> Copy Config values during construction.

Test: gradle support-emoji:connectedAndroidTest
Bug: 35972531
Merged-In: Ie4ccda5884f88cb92168445287a980e32fd9f943
Change-Id: Ie4ccda5884f88cb92168445287a980e32fd9f943
ndroid/support/text/emoji/EmojiCompat.java
3dc8b512ac3a1a8fb0b7b2618246d50fd2f3367b 23-Mar-2017 Siyamed Sinir <siyamed@google.com> Add debug mode for EmojiSpans

Draws a background color for EmojiSpans if debug
mode is enabled.

Test: New tests added, existing tests pass
gradle support-emoji:connectedAndroidTest

Bug: 35972531
Merged-In: I5e129ba62b7d38b99d93710498dd622b3f47d730
Change-Id: I5e129ba62b7d38b99d93710498dd622b3f47d730
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/EmojiMetadata.java
ndroid/support/text/emoji/TypefaceEmojiSpan.java
496a3d92d13163e614487024d94267244eda5443 30-Mar-2017 Siyamed Sinir <siyamed@google.com> Merge "Move processor argument checks into EmojiCompat" into oc-dev
894f169362c12ba9424214a075d2fa2cc255fb37 05-Feb-2017 Siyamed Sinir <siyamed@google.com> EmojiCompat font creation script

Creates the font and metadata for the EmojiCompat.

Test: Script tests to be added. Font itself is tested in core.

Bug: 30999328
Merged-In: I8f99dadf64940c5e398d182594d8f7556354097c
Change-Id: I8f99dadf64940c5e398d182594d8f7556354097c
ndroid/support/text/emoji/MetadataListReader.java
762584b0fcb1e681850a930dac3ad72d2fb51713 29-Mar-2017 Siyamed Sinir <siyamed@google.com> Move processor argument checks into EmojiCompat

Test: gradle support-emoji:connectedAndroidTest

Merged-In: I7b0fc20c390fa87e7d86743ce7df9df4eb82efb4
Change-Id: I7b0fc20c390fa87e7d86743ce7df9df4eb82efb4
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/EmojiProcessor.java
2a209ebe60eca0ddb4e2441ff8a07910c101c90d 25-Mar-2017 Siyamed Sinir <siyamed@google.com> Merge "Expose EmojiCompat loading state"
c79a89a2b8631c9ee81ae015ea74a6e1ac10de14 17-Mar-2017 Siyamed Sinir <siyamed@google.com> Make widgets no-op for sdk < 19

Test: Existing tests passes, added more tests.
Bug: 35811035
Change-Id: I95197304ca1d7a2536358c6bc30c6d2160568ad3
ndroid/support/text/emoji/widget/EmojiEditText.java
ndroid/support/text/emoji/widget/EmojiEditTextHelper.java
ndroid/support/text/emoji/widget/EmojiTextViewHelper.java
0d1e48d934880b40237ce980d154c3f3ff1c32f0 19-Mar-2017 Siyamed Sinir <siyamed@google.com> Expose EmojiCompat loading state

Expose the loading state from EmojiCompat class, and do not register
callbacks in the widgets if load state is fail.

Test: gradle support-emoji:connectedAndroidTest

Bug: 35995127
Change-Id: I7b752e6e74130bf5c298a25f7f5e05e8264b3c2d
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/widget/EmojiInputFilter.java
ndroid/support/text/emoji/widget/EmojiTextWatcher.java
ndroid/support/text/emoji/widget/EmojiTransformationMethod.java
611b9e77742d232d7eee9e05e95e6db63d3d97e4 18-Mar-2017 Siyamed Sinir <siyamed@google.com> Apply sdkAdded check only for pre M

Test: gradle :support-emoji:connectedAndroidTest

Change-Id: Iaf462ff1e09822ee48287ced9c9311831d0b1813
ndroid/support/text/emoji/EmojiProcessor.java
ed0c896362ed0467bc33d831a615276a6c7c05ef 16-Mar-2017 Siyamed Sinir <siyamed@google.com> jarjar flatbuffers into emojicompat namespace

Test: gradle :support-emoji:connectedDebugAndroidTest

Change-Id: I6aca4d9867377e81727b254a08cde3a12b6b7daf
ndroid/support/text/emoji/flatbuffer/MetadataItem.java
ndroid/support/text/emoji/flatbuffer/MetadataList.java
6e120d58ca0644c25fedee1d7e1d24b9547f43a8 16-Mar-2017 Siyamed Sinir <siyamed@google.com> Revert "Make widgets no-op for sdk < 19"

Build fail about 26.0.0.txt

This reverts commit 71505ed0dcbc4ca21d126eee3ccfb616ea35666e.

Test: gradle checkApiStable finishes successfully

Change-Id: I3b35b13e0d7b71b4c692efad379c93c47b768940
ndroid/support/text/emoji/widget/EmojiEditText.java
ndroid/support/text/emoji/widget/EmojiEditTextHelper.java
ndroid/support/text/emoji/widget/EmojiTextViewHelper.java
71505ed0dcbc4ca21d126eee3ccfb616ea35666e 04-Mar-2017 Siyamed Sinir <siyamed@google.com> Make widgets no-op for sdk < 19

Test: Existing tests passes, added more tests.
Bug: 35811035
Change-Id: I5646cae46d31214b4cc85eb56d70b33239816061
ndroid/support/text/emoji/widget/EmojiEditText.java
ndroid/support/text/emoji/widget/EmojiEditTextHelper.java
ndroid/support/text/emoji/widget/EmojiTextViewHelper.java
e5ce17abd4deddd8b32a63afd41905cb58a104da 09-Mar-2017 Siyamed Sinir <siyamed@google.com> Enable GuardedBy annotation in support library.

Previously commented annotations are un-commented since we added the
annotation to support-annotations.

Test: Build passes, no test needed.
Bug: 35757549
Change-Id: Ib8999bd5ce8791f91902ba41368b78be14404459
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/widget/EmojiEditableFactory.java
f8ec169d022fbed42fd82091d24c45f3767cdfe7 08-Feb-2017 Siyamed Sinir <siyamed@google.com> EmojiCompat Widget support

Adds widgets and helper classes to EmojiCompat

Test: Added tests to tests folder.

Bug: 30999328
Change-Id: I762fadd91323a48b23e34a99657c19440079942f
ndroid/support/text/emoji/EmojiProcessor.java
ndroid/support/text/emoji/widget/EmojiButton.java
ndroid/support/text/emoji/widget/EmojiEditText.java
ndroid/support/text/emoji/widget/EmojiEditTextHelper.java
ndroid/support/text/emoji/widget/EmojiEditableFactory.java
ndroid/support/text/emoji/widget/EmojiInputConnection.java
ndroid/support/text/emoji/widget/EmojiInputFilter.java
ndroid/support/text/emoji/widget/EmojiKeyListener.java
ndroid/support/text/emoji/widget/EmojiTextView.java
ndroid/support/text/emoji/widget/EmojiTextViewHelper.java
ndroid/support/text/emoji/widget/EmojiTextWatcher.java
ndroid/support/text/emoji/widget/EmojiTransformationMethod.java
ndroid/support/text/emoji/widget/SpannableBuilder.java
82d2cc1cf0c2bfdd5121e6d6913dfe9fcaacf439 05-Feb-2017 Siyamed Sinir <siyamed@google.com> EmojiCompat core

CharSequence processing and span creation.

Test: Added new tests to test folder

Bug: 30999328
Change-Id: I6c3a80e3072c0b2f4dc05d8632b75e7184f3cac9
ndroid/support/text/emoji/EmojiCompat.java
ndroid/support/text/emoji/EmojiMetadata.java
ndroid/support/text/emoji/EmojiProcessor.java
ndroid/support/text/emoji/EmojiSpan.java
ndroid/support/text/emoji/MetadataListReader.java
ndroid/support/text/emoji/MetadataRepo.java
ndroid/support/text/emoji/TypefaceEmojiSpan.java
ndroid/support/text/emoji/flatbuffer/MetadataItem.java
ndroid/support/text/emoji/flatbuffer/MetadataList.java