OSDN Git Service

Replace fonts of unknown origin
authorClara Bayarri <clarabayarri@google.com>
Wed, 7 Jun 2017 14:35:55 +0000 (15:35 +0100)
committerClara Bayarri <clarabayarri@google.com>
Wed, 7 Jun 2017 14:35:55 +0000 (15:35 +0100)
There are fonts that we are not sure where they came from,
replace with fonts we created ourselves.

The res/font/ folder does not build with gradle when there is
a ttx file in it, so fonts there have been copied from elsewhere
in the tree and contain copyright and licensing inside the font.
There is also a new readme in the root folder for the test projects
using these to point this out.

Bug: 37726227
Test: bit FrameworksCoreTests:android.content.res.FontResourcesParserTest
Change-Id: I43364abb9d466e9673902246b0d7c3043af619c1

core/tests/coretests/fonts_readme.txt [new file with mode: 0644]
core/tests/coretests/res/font/samplefont.ttf
core/tests/coretests/res/font/samplefont2.ttf
core/tests/coretests/res/font/samplefont3.ttf
core/tests/coretests/res/font/samplefont4.ttf

diff --git a/core/tests/coretests/fonts_readme.txt b/core/tests/coretests/fonts_readme.txt
new file mode 100644 (file)
index 0000000..f0de576
--- /dev/null
@@ -0,0 +1,15 @@
+All fonts included in this project follow the below copyright and licensing:
+
+Copyright (C) 2017 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
index 2852302..5fccad2 100644 (file)
Binary files a/core/tests/coretests/res/font/samplefont.ttf and b/core/tests/coretests/res/font/samplefont.ttf differ
index 2852302..f31b8a9 100644 (file)
Binary files a/core/tests/coretests/res/font/samplefont2.ttf and b/core/tests/coretests/res/font/samplefont2.ttf differ
index 2852302..9c850ab 100644 (file)
Binary files a/core/tests/coretests/res/font/samplefont3.ttf and b/core/tests/coretests/res/font/samplefont3.ttf differ
index 2852302..9c850ab 100644 (file)
Binary files a/core/tests/coretests/res/font/samplefont4.ttf and b/core/tests/coretests/res/font/samplefont4.ttf differ