433 Commits

Author SHA1 Message Date
Dan Willemsen
2d48700bb1 Use LOCAL_TEST_DATA to install test data am: 7e38090b57 am: 62047ccb25 am: 4c1fe1e28c
am: 1e8d13909a  -s ours

Change-Id: I802c851e0518533a0c845483dc94b603c60c328a
2016-12-15 20:39:23 +00:00
Dan Willemsen
1e8d13909a Use LOCAL_TEST_DATA to install test data am: 7e38090b57 am: 62047ccb25
am: 4c1fe1e28c

Change-Id: I3d7dd7c58c544e90176f25cac568c10facce726b
2016-12-15 20:32:52 +00:00
Dan Willemsen
4c1fe1e28c Use LOCAL_TEST_DATA to install test data am: 7e38090b57
am: 62047ccb25

Change-Id: Ie02fbdc89e59707c899175dadb9700a4873f8010
2016-12-15 20:25:53 +00:00
Dan Willemsen
62047ccb25 Use LOCAL_TEST_DATA to install test data
am: 7e38090b57

Change-Id: I09c27394d95417a0bb8b0ee8a48580e6e88dc8c6
2016-12-15 20:18:22 +00:00
Dan Willemsen
7e38090b57 Use LOCAL_TEST_DATA to install test data
This will handle installation for local builds as well as for the test
bundles.

Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Test: /data/nativetest{,64}/minikin_tests/minikin_tests
Change-Id: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
Merged-In: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
2016-12-15 18:47:17 +00:00
Dan Willemsen
7383094bf6 Merge "Use LOCAL_TEST_DATA to install test data" 2016-12-15 18:39:53 +00:00
Yirui Huang
a4a8c9cad6 Merge "Change language score calculation" 2016-12-14 05:45:23 +00:00
Dan Willemsen
6c5e3f1844 Use LOCAL_TEST_DATA to install test data
This will handle installation for local builds as well as for the test
bundles.

Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Test: /data/nativetest{,64}/minikin_tests/minikin_tests
Change-Id: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
2016-12-13 17:12:32 -08:00
Colin Cross
88e53947ad Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" am: 8d6a018645 am: 77f96edc2f am: 03959097a9
am: 8dc83b4547

Change-Id: I0d13d864021b47eed3ee730fb09783044423ecd4
2016-12-09 02:20:54 +00:00
Colin Cross
8dc83b4547 Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" am: 8d6a018645 am: 77f96edc2f
am: 03959097a9

Change-Id: I5bd69940f0e495119dd6154fb9e1efe34fa9a062
2016-12-09 02:10:36 +00:00
Colin Cross
03959097a9 Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" am: 8d6a018645
am: 77f96edc2f

Change-Id: I1e38ef5ae3a4d6a977df856abbb160b2e5fcde4e
2016-12-09 02:05:35 +00:00
Colin Cross
77f96edc2f Merge "Move LOCAL_PICKUP_FILES out of $OUT/data"
am: 8d6a018645

Change-Id: I0aac6741d2c92bbe46fdf89931460fbb41acc1ea
2016-12-09 02:01:37 +00:00
Colin Cross
8d6a018645 Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" 2016-12-09 01:53:13 +00:00
Yirui Huang
f20a2ef271 Change language score calculation
Change language score calculation in the calculation of the font family.
Instead of language and script matching, a match in subtag is added.
In addition, a match in subtag has a higher priority than a match in
script. The score levels are divided into 5 score levels and the limit
of the number of font languages is changed to 12 from 17. Multiple
languages selection rule could to be added in the future.

Bug: 31608997
Test: Done by unittests.
Change-Id: I1e7177095f604fd1794bc99ca36c705dcb4c56e7
2016-12-06 18:17:54 +09:00
Colin Cross
be7c33a74e Move LOCAL_PICKUP_FILES out of $OUT/data
minikin_tests was copying its test data to
$OUT/data/DATA/nativetest/minikin_test, and then packaging that with
LOCAL_PICKUP_FILES=$OUT/data/DATA, which would also pick up anything
any other module copyied to $OUT/data/DATA.  $OUT/data/DATA isn't
where the tests expect to find their data, they look in
/data/nativetest/minikin_test.  Copy the files to the intermediates
directory instead.

A future change will install LOCAL_PICKUP_FILES for local builds
to the correct place, so adb sync and
adb shell /data/nativetest/minikin_tests/minikin_tests will run the
tests.

Test: mma -j
Change-Id: I808ce743f51e5ccac711e22821e7e0d7cd94ffdf
2016-12-02 18:04:42 -08:00
Hal Canary
ccce2fd909 SkImageEncoder->SkEncodeImage
Test: none
Change-Id: I9115c41f1699ab5d9d677251d96ea8f4fb844845
2016-11-24 12:09:19 -05:00
yirui
9bc8f53117 Parse Emoji subtag and store it to FontLanguage
Parse Emoji subtag and store into 4 different styles: default, text,
color and empty. Replace hasEmojiFlag function with getEmojiStyle to
get effective status according to script and subtag. However, score
calculation for the font selection needs to be completed in the next
stage. No performance regression is observed with this CL.

Bug: 31608997
Test: Done by unittests.
Change-Id: I923243641c946248dd5a0aa9fb9c940515310d34
2016-11-21 06:24:26 +00:00
Seigo Nonaka
964f053ea4 Clean Up: Removing unused interface GetTable from MinikinFont.
This is 2nd attempt of Ifcd7a348d7fb5af081192899dbcdfc7fb4eebbf9

After Id766ab16a8d342bf7322a90e076e801271d527d4, GetTable is no longer
used in production due to poor performance and it is now only used in
tests. This CL removes GetTable interface from MinikinFont and update
tests code to use new interfaces, GetFontData, GetFontSize and
GetFontIndex.

Bug: 27860101
Test: Manually done
Change-Id: Ib48973ff25cdc61a4c666d28128266df0aaea83e
2016-11-17 17:36:51 +09:00
Seigo Nonaka
e906f2b416 Merge "Implement word spacing" 2016-11-17 08:00:05 +00:00
Martijn Coenen
7c620ba62d Fix calls to deprecated range_x.
Test: fixes master build.
Change-Id: I8b2822d310c0cf423b15834e6d6ae3a9ea64233b
2016-11-16 10:30:01 +01:00
Seigo Nonaka
6b9c9dec1f Implement word spacing
Add a wordSpacing paint parameter, which will be used for
justification.

Bug: 31707212
Test: ran minikin_tests
Change-Id: I91224ab8ef882ac0c87425c28ab731fead283612
2016-11-16 17:36:26 +09:00
Seigo Nonaka
c2a51ec51b Merge "Fix lookup order for VS in itemization." 2016-11-07 07:28:37 +00:00
Seigo Nonaka
dc8de001df Revert "Clean Up: Removing unused interface GetTable from MinikinFont."
This reverts commit 7b02f5e95c4386c250f6f83db1ff61b69177140e.

This causes a crash on Android Auto.

Bug: 32374752
Change-Id: Ia2ff77bf9a12351c6949f79ef6fa2d8016e3022d
2016-10-25 00:49:52 +00:00
Seigo Nonaka
7b02f5e95c Clean Up: Removing unused interface GetTable from MinikinFont.
After Id766ab16a8d342bf7322a90e076e801271d527d4, GetTable is no longer
used in production due to poor performance and it is now only used in
tests. This CL removes GetTable interface from MinikinFont and update
tests code to use new interfaces, GetFontData, GetFontSize and
GetFontIndex.

Bug: 27860101
Test: Manually done

Change-Id: Ifcd7a348d7fb5af081192899dbcdfc7fb4eebbf9
2016-10-18 08:16:18 +00:00
Seigo Nonaka
5bd8edea61 Fix lookup order for VS in itemization.
This is partial revert of Iced1349e3ca750821d8882c551551f65bb569794.

Due to sorting of target family vectors, the font family order from XML
settings file is broken. Making unique operation stable doesn't fix the
issue completely since some font families are appended for the fallback
which also breaks the original order.

By this change, itemization becomes 3x slower than before if variation
selector is appended.

Bug: 29585939
Change-Id: I7c1a8a57f04111a30cd41a5cd5bec25fcfb3972e
2016-09-15 16:23:40 +09:00
Dan Willemsen
4d688b0172 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: f8ca78ffa4 am: 90f9f8d7a2 am: e2217d5b85
am: b4c239f555

Change-Id: I85ee278323a578fcf941651161b46ef0559098cc
2016-09-13 04:32:28 +00:00
Dan Willemsen
b4c239f555 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: f8ca78ffa4 am: 90f9f8d7a2
am: e2217d5b85

Change-Id: I346fddaa5822eee2371d877a8bdeb055b6244c0d
2016-09-13 03:58:51 +00:00
Dan Willemsen
e2217d5b85 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: f8ca78ffa4
am: 90f9f8d7a2

Change-Id: Ia8b56a95d11d74af5a2cac1fe8e604532c44a9cf
2016-09-13 03:56:10 +00:00
Dan Willemsen
90f9f8d7a2 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"
am: f8ca78ffa4

Change-Id: Ia005ecb8dedc90aa8a908edda839da563152e861
2016-09-13 03:51:13 +00:00
Dan Willemsen
f8ca78ffa4 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" 2016-09-13 03:47:02 +00:00
Elliott Hughes
88ca7498cc Switch minikin to std::unique_ptr. am: fba88d3b3c am: c5e0585ac7 am: 83bdd0ae73
am: b150a633ba

Change-Id: I56cce90607bce82d337d4da3b4ac5f167c7cc1b4
2016-09-13 01:50:14 +00:00
Elliott Hughes
b150a633ba Switch minikin to std::unique_ptr. am: fba88d3b3c am: c5e0585ac7
am: 83bdd0ae73

Change-Id: I9c0b81d55e01b08b053a7031a214626351244607
2016-09-13 01:29:45 +00:00
Elliott Hughes
83bdd0ae73 Switch minikin to std::unique_ptr. am: fba88d3b3c
am: c5e0585ac7

Change-Id: Ie9f9aac239cb29568819de699e4999989a7a11bf
2016-09-13 01:27:07 +00:00
Elliott Hughes
c5e0585ac7 Switch minikin to std::unique_ptr.
am: fba88d3b3c

Change-Id: I91198bdae7aac9638e6ef3553b0eacac021d4f93
2016-09-13 01:24:37 +00:00
Elliott Hughes
fba88d3b3c Switch minikin to std::unique_ptr.
Bug: http://b/22403888
Change-Id: I9e18496fcc38ad2e6b922455daa9f2a46778ec55
2016-09-12 15:29:35 -07:00
Dan Willemsen
b4f4c16d32 Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n
These modules can be named the same between the target and host
libraries, which simplifies references to them, particularly in
Soong.

To prevent accidentally loading the system copy of the library,
we still rename the installed name to be libicu*-host.so. But
modules do not need to know that in order to build against them.

Change-Id: Ic38499bb236ace75333a84f23798af023e14cf5f
2016-09-12 14:37:02 -07:00
Chih-Hung Hsieh
cb98ad0293 Fix google-explicit-constructor warnings in minikin am: 32252e357f -s ours am: 58514b3cce am: 83c5cedc63
am: a061ed7415

Change-Id: Ie330bd0bfec81c3a8d159a13d96480dbd2774855
2016-08-16 21:20:27 +00:00
Chih-Hung Hsieh
a061ed7415 Fix google-explicit-constructor warnings in minikin am: 32252e357f -s ours am: 58514b3cce
am: 83c5cedc63

Change-Id: I3623a0f372da99c5a189bc5900b3f55bc3d7b0be
2016-08-16 21:14:54 +00:00
Chih-Hung Hsieh
83c5cedc63 Fix google-explicit-constructor warnings in minikin am: 32252e357f -s ours
am: 58514b3cce

Change-Id: Idf3e3882894774d917166e4eec743fb8bea0c31b
2016-08-16 21:13:13 +00:00
Chih-Hung Hsieh
58514b3cce Fix google-explicit-constructor warnings in minikin
am: 32252e357f  -s ours

Change-Id: I51c71217e402c3cbeefd6de5ccf7252dc1687f76
2016-08-16 21:08:26 +00:00
Chih-Hung Hsieh
32252e357f Fix google-explicit-constructor warnings in minikin
* Add explicit keyword to conversion constructors,
  or add NOLINT(implicit) for implicit converters.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I0c7b90f9bb953a9f2e4f0fb2032fa65ac604b9ca
Merged-In: I0c7b90f9bb953a9f2e4f0fb2032fa65ac604b9ca
2016-08-16 01:48:48 +00:00
Chih-Hung Hsieh
85c660fa98 Fix google-explicit-constructor warnings in minikin
* Add explicit keyword to conversion constructors,
  or add NOLINT(implicit) for implicit converters.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I0c7b90f9bb953a9f2e4f0fb2032fa65ac604b9ca
2016-08-15 13:58:52 -07:00
Roozbeh Pournader
8bbb3224cf Revert "Lookup glyph from color emoji font before and after ZWJ." am: 96fa633577 am: 01be577f0e
am: 777a92cefa

Change-Id: Iebf945839891cc1ab561cf424ef917ac15e08842
2016-08-11 23:40:20 +00:00
Roozbeh Pournader
777a92cefa Revert "Lookup glyph from color emoji font before and after ZWJ." am: 96fa633577
am: 01be577f0e

Change-Id: Id1b94e72ccd480bf5395752868f7f26e17ab7491
2016-08-11 23:36:50 +00:00
Roozbeh Pournader
01be577f0e Revert "Lookup glyph from color emoji font before and after ZWJ."
am: 96fa633577

Change-Id: Icc8b76ebd3edfdeb7622bf21a6585b191cf5b15f
2016-08-11 23:32:49 +00:00
Roozbeh Pournader
96fa633577 Revert "Lookup glyph from color emoji font before and after ZWJ."
This reverts commit 56bda7e82a59b3fcaa828960deeb2a766f8afdfe.

Bug: 30815709
Change-Id: I057d9bcd05246e58894abb4e9633bd10f6fab211
2016-08-11 21:03:00 +00:00
Ben Wagner
3ebdaaae86 Move SkTypeface::CreateXXX to SkTypeface::MakeXXX.
Skia is moving to returning smart pointers from its factory methods.
This updates uses of SkTypeface::CreateXXX to SkTypeface::MakeXXX and
generally updates use of SkTypeface to sk_sp. This will allow for the
removal of the SK_SUPPORT_LEGACY_TYPEFACE_PTR define.

Change-Id: If3e600c6cb86080576667bc77d427da4f6560afa
2016-08-05 13:57:22 -04:00
Seigo Nonaka
0e47edac42 Lookup glyph from color emoji font before and after ZWJ. am: 56bda7e82a
am: 8072cf551c

Change-Id: I6c77cba0290c56995bf56cfb876dd60989e50b9b
2016-07-15 00:28:05 +00:00
Seigo Nonaka
790bdaf424 Treat U+2695, U+2640, U+2642 as emoji characters. am: c5d673d423
am: 9c9c199f65  -s ours

Change-Id: Ib77b3862c81da7c58bd64846c0950534c12b5492
2016-07-15 00:27:35 +00:00
Seigo Nonaka
a169db954e Add some gender balanced components in to the sticky whitelist. am: 2fd057eb70
am: e74b7cfd5e  -s ours

Change-Id: I3fb287e86b3ecb8a61dca114578fe3a067a4469f
2016-07-14 23:14:28 +00:00