From 806be79ac81ccbf0bc6eb46e6664a64e497f07c7 Mon Sep 17 00:00:00 2001 From: Jay Aliomer Date: Wed, 22 Apr 2020 14:49:18 -0400 Subject: Adding style packages/fonts adding the pixel 2020 styles and fonts Bug: 145530620 Bug: 145529629 Test: test the styles app Change-Id: I5041232497f607d29c8e3dee3073cfbadfa754b2 --- Android.bp | 25 +++++++++++++++++++++++++ BigShouldersText-Black.ttf | Bin 121048 -> 0 bytes BigShouldersText-Light.ttf | Bin 116380 -> 0 bytes BigShouldersText-Medium.ttf | Bin 118240 -> 0 bytes BigShouldersText-Regular.ttf | Bin 117480 -> 0 bytes BigShouldersText-SemiBold.ttf | Bin 118600 -> 0 bytes BigShouldersText-Thin.ttf | Bin 113696 -> 0 bytes README | 1 + fonts.mk | 18 ++++++++++++++++++ fonts/BigShouldersText-Black.ttf | Bin 0 -> 121048 bytes fonts/BigShouldersText-Bold.ttf | Bin 0 -> 118556 bytes fonts/BigShouldersText-ExtraBold.ttf | Bin 0 -> 118904 bytes fonts/BigShouldersText-Light.ttf | Bin 0 -> 116380 bytes fonts/BigShouldersText-Medium.ttf | Bin 0 -> 118240 bytes fonts/BigShouldersText-Regular.ttf | Bin 0 -> 117480 bytes fonts/BigShouldersText-SemiBold.ttf | Bin 0 -> 118600 bytes fonts/BigShouldersText-Thin.ttf | Bin 0 -> 113696 bytes 17 files changed, 44 insertions(+) create mode 100644 Android.bp delete mode 100644 BigShouldersText-Black.ttf delete mode 100644 BigShouldersText-Light.ttf delete mode 100644 BigShouldersText-Medium.ttf delete mode 100644 BigShouldersText-Regular.ttf delete mode 100644 BigShouldersText-SemiBold.ttf delete mode 100644 BigShouldersText-Thin.ttf create mode 100644 README create mode 100644 fonts.mk create mode 100644 fonts/BigShouldersText-Black.ttf create mode 100644 fonts/BigShouldersText-Bold.ttf create mode 100644 fonts/BigShouldersText-ExtraBold.ttf create mode 100644 fonts/BigShouldersText-Light.ttf create mode 100644 fonts/BigShouldersText-Medium.ttf create mode 100644 fonts/BigShouldersText-Regular.ttf create mode 100644 fonts/BigShouldersText-SemiBold.ttf create mode 100644 fonts/BigShouldersText-Thin.ttf diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..e2721ef --- /dev/null +++ b/Android.bp @@ -0,0 +1,25 @@ + +// Copyright (C) 2020 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. + +prebuilt_font { + name: "BigShouldersText-Bold.ttf", + src: "BigShouldersText-Bold.ttf", +} + +prebuilt_font { + name: "BigShouldersText-ExtraBold.ttf", + src: "BigShouldersText-ExtraBold.ttf", +} + \ No newline at end of file diff --git a/BigShouldersText-Black.ttf b/BigShouldersText-Black.ttf deleted file mode 100644 index 6dc3464..0000000 Binary files a/BigShouldersText-Black.ttf and /dev/null differ diff --git a/BigShouldersText-Light.ttf b/BigShouldersText-Light.ttf deleted file mode 100644 index b10deda..0000000 Binary files a/BigShouldersText-Light.ttf and /dev/null differ diff --git a/BigShouldersText-Medium.ttf b/BigShouldersText-Medium.ttf deleted file mode 100644 index c20e7d7..0000000 Binary files a/BigShouldersText-Medium.ttf and /dev/null differ diff --git a/BigShouldersText-Regular.ttf b/BigShouldersText-Regular.ttf deleted file mode 100644 index cd82013..0000000 Binary files a/BigShouldersText-Regular.ttf and /dev/null differ diff --git a/BigShouldersText-SemiBold.ttf b/BigShouldersText-SemiBold.ttf deleted file mode 100644 index 564a69a..0000000 Binary files a/BigShouldersText-SemiBold.ttf and /dev/null differ diff --git a/BigShouldersText-Thin.ttf b/BigShouldersText-Thin.ttf deleted file mode 100644 index 3354365..0000000 Binary files a/BigShouldersText-Thin.ttf and /dev/null differ diff --git a/README b/README new file mode 100644 index 0000000..d5a4b3b --- /dev/null +++ b/README @@ -0,0 +1 @@ +the ./fonts directory contain unused fonts. diff --git a/fonts.mk b/fonts.mk new file mode 100644 index 0000000..a05e8ef --- /dev/null +++ b/fonts.mk @@ -0,0 +1,18 @@ + +# Copyright (C) 2020 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. + +PRODUCT_PACKAGES += \ + BigShouldersText-Bold.ttf \ + BigShouldersText-ExtraBold.ttf diff --git a/fonts/BigShouldersText-Black.ttf b/fonts/BigShouldersText-Black.ttf new file mode 100644 index 0000000..6dc3464 Binary files /dev/null and b/fonts/BigShouldersText-Black.ttf differ diff --git a/fonts/BigShouldersText-Bold.ttf b/fonts/BigShouldersText-Bold.ttf new file mode 100644 index 0000000..1ef6f50 Binary files /dev/null and b/fonts/BigShouldersText-Bold.ttf differ diff --git a/fonts/BigShouldersText-ExtraBold.ttf b/fonts/BigShouldersText-ExtraBold.ttf new file mode 100644 index 0000000..908dd9c Binary files /dev/null and b/fonts/BigShouldersText-ExtraBold.ttf differ diff --git a/fonts/BigShouldersText-Light.ttf b/fonts/BigShouldersText-Light.ttf new file mode 100644 index 0000000..b10deda Binary files /dev/null and b/fonts/BigShouldersText-Light.ttf differ diff --git a/fonts/BigShouldersText-Medium.ttf b/fonts/BigShouldersText-Medium.ttf new file mode 100644 index 0000000..c20e7d7 Binary files /dev/null and b/fonts/BigShouldersText-Medium.ttf differ diff --git a/fonts/BigShouldersText-Regular.ttf b/fonts/BigShouldersText-Regular.ttf new file mode 100644 index 0000000..cd82013 Binary files /dev/null and b/fonts/BigShouldersText-Regular.ttf differ diff --git a/fonts/BigShouldersText-SemiBold.ttf b/fonts/BigShouldersText-SemiBold.ttf new file mode 100644 index 0000000..564a69a Binary files /dev/null and b/fonts/BigShouldersText-SemiBold.ttf differ diff --git a/fonts/BigShouldersText-Thin.ttf b/fonts/BigShouldersText-Thin.ttf new file mode 100644 index 0000000..3354365 Binary files /dev/null and b/fonts/BigShouldersText-Thin.ttf differ -- cgit v1.2.3 From ec4d8a9ca673e76a55b92db7c81ca5b4406aecff Mon Sep 17 00:00:00 2001 From: Jay Aliomer Date: Fri, 15 May 2020 20:12:27 -0400 Subject: Remove new styles from AOSP Fixes: 156779458 Test: manually check styles" Change-Id: I78736e6408c1feb98949fb83c2f4c0574e8b2794 --- Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.bp b/Android.bp index e2721ef..1b4aba1 100644 --- a/Android.bp +++ b/Android.bp @@ -16,10 +16,12 @@ prebuilt_font { name: "BigShouldersText-Bold.ttf", src: "BigShouldersText-Bold.ttf", + product_specific: true, } prebuilt_font { name: "BigShouldersText-ExtraBold.ttf", src: "BigShouldersText-ExtraBold.ttf", + product_specific: true, } \ No newline at end of file -- cgit v1.2.3 From 2a67950c997bf83a1d07d48164319ec861028407 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 20:25:09 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/big-shoulders-text Added SPDX-license-identifier-MIT SPDX-license-identifier-OFL to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I44be161dc4510b4039184709fcb9f023bcc63c13 --- Android.bp | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 1b4aba1..670d211 100644 --- a/Android.bp +++ b/Android.bp @@ -13,6 +13,41 @@ // See the License for the specific language governing permissions and // limitations under the License. +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + default_applicable_licenses: [ + "external_google-fonts_big-shoulders-text_license", + ], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// See: http://go/android-license-faq +license { + name: "external_google-fonts_big-shoulders-text_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-OFL", // by exception only + ], + license_text: [ + "LICENSE", + ], +} + prebuilt_font { name: "BigShouldersText-Bold.ttf", src: "BigShouldersText-Bold.ttf", @@ -24,4 +59,4 @@ prebuilt_font { src: "BigShouldersText-ExtraBold.ttf", product_specific: true, } - \ No newline at end of file + -- cgit v1.2.3