From d2e7a012394441af21c5a8b9f1ff75816c56dad8 Mon Sep 17 00:00:00 2001 From: Clara Bayarri Date: Wed, 7 Jun 2017 15:35:55 +0100 Subject: Replace fonts of unknown origin 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 | 15 +++++++++++++++ core/tests/coretests/res/font/samplefont.ttf | Bin 133372 -> 1768 bytes core/tests/coretests/res/font/samplefont2.ttf | Bin 133372 -> 1768 bytes core/tests/coretests/res/font/samplefont3.ttf | Bin 133372 -> 1768 bytes core/tests/coretests/res/font/samplefont4.ttf | Bin 133372 -> 1768 bytes 5 files changed, 15 insertions(+) create mode 100644 core/tests/coretests/fonts_readme.txt diff --git a/core/tests/coretests/fonts_readme.txt b/core/tests/coretests/fonts_readme.txt new file mode 100644 index 000000000000..f0de5768c47e --- /dev/null +++ b/core/tests/coretests/fonts_readme.txt @@ -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 diff --git a/core/tests/coretests/res/font/samplefont.ttf b/core/tests/coretests/res/font/samplefont.ttf index 285230293580..5fccad24d8aa 100644 Binary files a/core/tests/coretests/res/font/samplefont.ttf and b/core/tests/coretests/res/font/samplefont.ttf differ diff --git a/core/tests/coretests/res/font/samplefont2.ttf b/core/tests/coretests/res/font/samplefont2.ttf index 285230293580..f31b8a927222 100644 Binary files a/core/tests/coretests/res/font/samplefont2.ttf and b/core/tests/coretests/res/font/samplefont2.ttf differ diff --git a/core/tests/coretests/res/font/samplefont3.ttf b/core/tests/coretests/res/font/samplefont3.ttf index 285230293580..9c850ab280f8 100644 Binary files a/core/tests/coretests/res/font/samplefont3.ttf and b/core/tests/coretests/res/font/samplefont3.ttf differ diff --git a/core/tests/coretests/res/font/samplefont4.ttf b/core/tests/coretests/res/font/samplefont4.ttf index 285230293580..9c850ab280f8 100644 Binary files a/core/tests/coretests/res/font/samplefont4.ttf and b/core/tests/coretests/res/font/samplefont4.ttf differ -- cgit v1.2.3-59-g8ed1b