omni: add google clock font and use it on ls clock
also switch to Android.bp for font install
Change-Id: Ib8f24f895f319d7321c3ff953c74b6e92d945a0e
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index ef1f6ae..bfb249c 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -90,7 +90,7 @@
<bool name="config_supportsCamToggle">true</bool>
<bool name="config_buttonTextAllCaps">false</bool>
-
- <string name="config_clockFontFamily" translatable="false">sans-serif</string>
+
+ <string name="config_clockFontFamily">google-sans-clock</string>
</resources>
diff --git a/prebuilt/etc/fonts_customization.xml b/prebuilt/etc/fonts_customization.xml
index 7432a61..2981dc8 100644
--- a/prebuilt/etc/fonts_customization.xml
+++ b/prebuilt/etc/fonts_customization.xml
@@ -22,4 +22,7 @@
</family>
<alias name="muli-semi-bold" to="muli" weight="600" />
<alias name="muli-bold" to="muli" weight="700" />
+ <family customizationType="new-named-family" name="google-sans-clock">
+ <font>GoogleSansClock-Regular.ttf</font>
+ </family>
</fonts-modification>
diff --git a/prebuilt/fonts/Android.bp b/prebuilt/fonts/Android.bp
new file mode 100644
index 0000000..8336cf1
--- /dev/null
+++ b/prebuilt/fonts/Android.bp
@@ -0,0 +1,67 @@
+// Copyright (C) 2018 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: "Muli-Regular.ttf",
+ src: "Muli-Regular.ttf",
+ product_specific: true,
+}
+
+prebuilt_font {
+ name: "Muli-Italic.ttf",
+ src: "Muli-Italic.ttf",
+ product_specific: true,
+}
+
+prebuilt_font {
+ name: "Muli-Medium.ttf",
+ src: "Muli-Medium.ttf",
+ product_specific: true,
+}
+
+prebuilt_font {
+ name: "Muli-MediumItalic.ttf",
+ src: "Muli-MediumItalic.ttf",
+ product_specific: true,
+}
+
+prebuilt_font {
+ name: "Muli-Bold.ttf",
+ src: "Muli-Bold.ttf",
+ product_specific: true,
+}
+
+prebuilt_font {
+ name: "Muli-BoldItalic.ttf",
+ src: "Muli-BoldItalic.ttf",
+ product_specific: true,
+}
+
+prebuilt_font {
+ name: "Muli-SemiBold.ttf",
+ src: "Muli-SemiBold.ttf",
+ product_specific: true,
+}
+
+prebuilt_font {
+ name: "Muli-SemiBoldItalic.ttf",
+ src: "Muli-SemiBoldItalic.ttf",
+ product_specific: true,
+}
+
+prebuilt_font {
+ name: "GoogleSansClock-Regular.ttf",
+ src: "GoogleSansClock-Regular.ttf",
+ product_specific: true,
+}
\ No newline at end of file
diff --git a/prebuilt/fonts/Android.mk b/prebuilt/fonts/Android.mk
deleted file mode 100644
index a8287c3..0000000
--- a/prebuilt/fonts/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 2018 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.
-
-# We have to use BUILD_PREBUILT instead of PRODUCT_COPY_FIES,
-# to copy over the NOTICE file.
-
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(SMALLER_FONT_FOOTPRINT),true)
-
-include $(CLEAR_VARS)
-
-# Build the rest of font files as prebuilt.
-# $(1): The source file name in LOCAL_PATH.
-# It also serves as the module name and the dest file name.
-define build-one-font-module
-$(eval include $(CLEAR_VARS))\
-$(eval LOCAL_MODULE := $(1))\
-$(eval LOCAL_SRC_FILES := $(1))\
-$(eval LOCAL_MODULE_CLASS := ETC)\
-$(eval LOCAL_MODULE_TAGS := optional)\
-$(eval LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/fonts)\
-$(eval LOCAL_PRODUCT_MODULE := true) \
-$(eval include $(BUILD_PREBUILT))
-endef
-
-font_src_files := \
- Muli-Regular.ttf \
- Muli-Italic.ttf \
- Muli-Medium.ttf \
- Muli-MediumItalic.ttf \
- Muli-SemiBold.ttf \
- Muli-SemiBoldItalic.ttf \
- Muli-Bold.ttf \
- Muli-BoldItalic.ttf
-
-$(foreach f, $(font_src_files), $(call build-one-font-module, $(f)))
-
-build-one-font-module :=
-font_src_files :=
-
-endif
diff --git a/prebuilt/fonts/GoogleSansClock-Regular.ttf b/prebuilt/fonts/GoogleSansClock-Regular.ttf
new file mode 100644
index 0000000..5e683a0
--- /dev/null
+++ b/prebuilt/fonts/GoogleSansClock-Regular.ttf
Binary files differ
diff --git a/prebuilt/fonts/fonts.mk b/prebuilt/fonts/fonts.mk
index f7f508d..69f6749 100644
--- a/prebuilt/fonts/fonts.mk
+++ b/prebuilt/fonts/fonts.mk
@@ -24,4 +24,5 @@
Muli-SemiBold.ttf \
Muli-SemiBoldItalic.ttf \
Muli-Bold.ttf \
- Muli-BoldItalic.ttf
+ Muli-BoldItalic.ttf \
+ GoogleSansClock-Regular.ttf