Merge "Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into merge_platform_dev" into androidx-main

21 files changed, 54 insertions, 36 deletions

diff --git a/fonts.mk b/fonts.mk
index fee43e2..13bfbfb 100644
--- a/fonts.mk
+++ b/fonts.mk
@@ -22,7 +22,7 @@ PRODUCT_PACKAGES := \
     NotoNaskhArabic-Regular.ttf \
     NotoNaskhArabicUI-Bold.ttf \
     NotoNaskhArabicUI-Regular.ttf \
-    NotoSansAdlam-Regular.ttf \
+    NotoSansAdlam-VF.ttf \
     NotoSansAhom-Regular.otf \
     NotoSansAnatolianHieroglyphs-Regular.otf \
     NotoSansArmenian-Bold.otf \
@@ -64,19 +64,19 @@ PRODUCT_PACKAGES := \
     NotoSansElbasan-Regular.otf \
     NotoSansEthiopic-Bold.ttf \
     NotoSansEthiopic-Regular.ttf \
-    NotoSansGeorgian-Bold.otf \
-    NotoSansGeorgian-Medium.otf \
-    NotoSansGeorgian-Regular.otf \
+    NotoSansGeorgian-VF.ttf \
     NotoSansGlagolitic-Regular.ttf \
     NotoSansGothic-Regular.ttf \
     NotoSansGujarati-Bold.ttf \
     NotoSansGujarati-Regular.ttf \
     NotoSansGujaratiUI-Bold.ttf \
     NotoSansGujaratiUI-Regular.ttf \
+    NotoSansGunjalaGondi-Regular.otf \
     NotoSansGurmukhi-Bold.ttf \
     NotoSansGurmukhi-Regular.ttf \
     NotoSansGurmukhiUI-Bold.ttf \
     NotoSansGurmukhiUI-Regular.ttf \
+    NotoSansHanifiRohingya-Regular.otf \
     NotoSansHanunoo-Regular.ttf \
     NotoSansHatran-Regular.otf \
     NotoSansHebrew-Bold.ttf \
@@ -84,7 +84,7 @@ PRODUCT_PACKAGES := \
     NotoSansImperialAramaic-Regular.ttf \
     NotoSansInscriptionalPahlavi-Regular.ttf \
     NotoSansInscriptionalParthian-Regular.ttf \
-    NotoSansJavanese-Regular.ttf \
+    NotoSansJavanese-Regular.otf \
     NotoSansKaithi-Regular.ttf \
     NotoSansKannada-Bold.ttf \
     NotoSansKannada-Regular.ttf \
@@ -95,6 +95,7 @@ PRODUCT_PACKAGES := \
     NotoSansKhmer-VF.ttf \
     NotoSansKhmerUI-Bold.ttf \
     NotoSansKhmerUI-Regular.ttf \
+    NotoSansKhojki-Regular.otf \
     NotoSansLao-Bold.ttf \
     NotoSansLao-Regular.ttf \
     NotoSansLaoUI-Bold.ttf \
@@ -115,6 +116,7 @@ PRODUCT_PACKAGES := \
     NotoSansMandaic-Regular.ttf \
     NotoSansManichaean-Regular.otf \
     NotoSansMarchen-Regular.otf \
+    NotoSansMasaramGondi-Regular.otf \
     NotoSansMeeteiMayek-Regular.ttf \
     NotoSansMeroitic-Regular.otf \
     NotoSansMiao-Regular.otf \
@@ -193,9 +195,11 @@ PRODUCT_PACKAGES := \
     NotoSansThaiUI-Regular.ttf \
     NotoSansTibetan-Bold.ttf \
     NotoSansTibetan-Regular.ttf \
-    NotoSansTifinagh-Regular.ttf \
+    NotoSansTifinagh-Regular.otf \
     NotoSansUgaritic-Regular.ttf \
     NotoSansVai-Regular.ttf \
+    NotoSansWancho-Regular.otf \
+    NotoSansWarangCiti-Regular.otf \
     NotoSansYi-Regular.ttf \
     NotoSerif-Bold.ttf \
     NotoSerif-BoldItalic.ttf \
@@ -210,8 +214,7 @@ PRODUCT_PACKAGES := \
     NotoSerifDevanagari-Regular.ttf \
     NotoSerifEthiopic-Bold.otf \
     NotoSerifEthiopic-Regular.otf \
-    NotoSerifGeorgian-Bold.otf \
-    NotoSerifGeorgian-Regular.otf \
+    NotoSerifGeorgian-VF.ttf \
     NotoSerifGujarati-Bold.ttf \
     NotoSerifGujarati-Regular.ttf \
     NotoSerifGurmukhi-Bold.otf \
diff --git a/other/Android.bp b/other/Android.bp
index d439501..7c2cd2b 100644
--- a/other/Android.bp
+++ b/other/Android.bp
@@ -33,8 +33,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansAdlam-Regular.ttf",
-    src: "NotoSansAdlam-Regular.ttf",
+    name: "NotoSansAdlam-VF.ttf",
+    src: "NotoSansAdlam-VF.ttf",
 }
 
 prebuilt_font {
@@ -268,8 +268,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansJavanese-Regular.ttf",
-    src: "NotoSansJavanese-Regular.ttf",
+    name: "NotoSansJavanese-Regular.otf",
+    src: "NotoSansJavanese-Regular.otf",
 }
 
 prebuilt_font {
@@ -778,11 +778,6 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansTifinagh-Regular.ttf",
-    src: "NotoSansTifinagh-Regular.ttf",
-}
-
-prebuilt_font {
     name: "NotoSansUgaritic-Regular.ttf",
     src: "NotoSansUgaritic-Regular.ttf",
 }
@@ -863,18 +858,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSansGeorgian-Regular.otf",
-    src: "NotoSansGeorgian-Regular.otf",
-}
-
-prebuilt_font {
-    name: "NotoSansGeorgian-Bold.otf",
-    src: "NotoSansGeorgian-Bold.otf",
-}
-
-prebuilt_font {
-    name: "NotoSansGeorgian-Medium.otf",
-    src: "NotoSansGeorgian-Medium.otf",
+    name: "NotoSansGeorgian-VF.ttf",
+    src: "NotoSansGeorgian-VF.ttf",
 }
 
 prebuilt_font {
@@ -923,6 +908,41 @@ prebuilt_font {
 }
 
 prebuilt_font {
+    name: "NotoSansGunjalaGondi-Regular.otf",
+    src: "NotoSansGunjalaGondi-Regular.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansHanifiRohingya-Regular.otf",
+    src: "NotoSansHanifiRohingya-Regular.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansKhojki-Regular.otf",
+    src: "NotoSansKhojki-Regular.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansMasaramGondi-Regular.otf",
+    src: "NotoSansMasaramGondi-Regular.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansTifinagh-Regular.otf",
+    src: "NotoSansTifinagh-Regular.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansWancho-Regular.otf",
+    src: "NotoSansWancho-Regular.otf",
+}
+
+prebuilt_font {
+    name: "NotoSansWarangCiti-Regular.otf",
+    src: "NotoSansWarangCiti-Regular.otf",
+}
+
+prebuilt_font {
     name: "NotoSerifArmenian-Regular.otf",
     src: "NotoSerifArmenian-Regular.otf",
 }
@@ -958,13 +978,8 @@ prebuilt_font {
 }
 
 prebuilt_font {
-    name: "NotoSerifGeorgian-Bold.otf",
-    src: "NotoSerifGeorgian-Bold.otf",
-}
-
-prebuilt_font {
-    name: "NotoSerifGeorgian-Regular.otf",
-    src: "NotoSerifGeorgian-Regular.otf",
+    name: "NotoSerifGeorgian-VF.ttf",
+    src: "NotoSerifGeorgian-VF.ttf",
 }
 
 prebuilt_font {
diff --git a/other/NotoSansAdlam-Regular.ttf b/other/NotoSansAdlam-Regular.ttf
deleted file mode 100644
index 20ea4ba..0000000
--- a/other/NotoSansAdlam-Regular.ttf
+++ /dev/null
diff --git a/other/NotoSansAdlam-VF.ttf b/other/NotoSansAdlam-VF.ttf
new file mode 100644
index 0000000..a1c9159
--- /dev/null
+++ b/other/NotoSansAdlam-VF.ttf
diff --git a/other/NotoSansGeorgian-Bold.otf b/other/NotoSansGeorgian-Bold.otf
deleted file mode 100644
index 086bd40..0000000
--- a/other/NotoSansGeorgian-Bold.otf
+++ /dev/null
diff --git a/other/NotoSansGeorgian-Medium.otf b/other/NotoSansGeorgian-Medium.otf
deleted file mode 100644
index 15e5eb6..0000000
--- a/other/NotoSansGeorgian-Medium.otf
+++ /dev/null
diff --git a/other/NotoSansGeorgian-Regular.otf b/other/NotoSansGeorgian-Regular.otf
deleted file mode 100644
index e59f368..0000000
--- a/other/NotoSansGeorgian-Regular.otf
+++ /dev/null
diff --git a/other/NotoSansGeorgian-VF.ttf b/other/NotoSansGeorgian-VF.ttf
new file mode 100644
index 0000000..25df7f1
--- /dev/null
+++ b/other/NotoSansGeorgian-VF.ttf
diff --git a/other/NotoSansGunjalaGondi-Regular.otf b/other/NotoSansGunjalaGondi-Regular.otf
new file mode 100644
index 0000000..4cc0fa3
--- /dev/null
+++ b/other/NotoSansGunjalaGondi-Regular.otf
diff --git a/other/NotoSansHanifiRohingya-Regular.otf b/other/NotoSansHanifiRohingya-Regular.otf
new file mode 100644
index 0000000..f3dc231
--- /dev/null
+++ b/other/NotoSansHanifiRohingya-Regular.otf
diff --git a/other/NotoSansJavanese-Regular.otf b/other/NotoSansJavanese-Regular.otf
new file mode 100644
index 0000000..e1aa665
--- /dev/null
+++ b/other/NotoSansJavanese-Regular.otf
diff --git a/other/NotoSansJavanese-Regular.ttf b/other/NotoSansJavanese-Regular.ttf
deleted file mode 100644
index 2a855ed..0000000
--- a/other/NotoSansJavanese-Regular.ttf
+++ /dev/null
diff --git a/other/NotoSansKhojki-Regular.otf b/other/NotoSansKhojki-Regular.otf
new file mode 100644
index 0000000..99146ac
--- /dev/null
+++ b/other/NotoSansKhojki-Regular.otf
diff --git a/other/NotoSansMasaramGondi-Regular.otf b/other/NotoSansMasaramGondi-Regular.otf
new file mode 100644
index 0000000..8833d01
--- /dev/null
+++ b/other/NotoSansMasaramGondi-Regular.otf
diff --git a/other/NotoSansTifinagh-Regular.otf b/other/NotoSansTifinagh-Regular.otf
new file mode 100644
index 0000000..c8b87c8
--- /dev/null
+++ b/other/NotoSansTifinagh-Regular.otf
diff --git a/other/NotoSansTifinagh-Regular.ttf b/other/NotoSansTifinagh-Regular.ttf
deleted file mode 100644
index 252a0dc..0000000
--- a/other/NotoSansTifinagh-Regular.ttf
+++ /dev/null
diff --git a/other/NotoSansWancho-Regular.otf b/other/NotoSansWancho-Regular.otf
new file mode 100644
index 0000000..af941de
--- /dev/null
+++ b/other/NotoSansWancho-Regular.otf
diff --git a/other/NotoSansWarangCiti-Regular.otf b/other/NotoSansWarangCiti-Regular.otf
new file mode 100644
index 0000000..5da59fe
--- /dev/null
+++ b/other/NotoSansWarangCiti-Regular.otf
diff --git a/other/NotoSerifGeorgian-Bold.otf b/other/NotoSerifGeorgian-Bold.otf
deleted file mode 100644
index 1c2c01f..0000000
--- a/other/NotoSerifGeorgian-Bold.otf
+++ /dev/null
diff --git a/other/NotoSerifGeorgian-Regular.otf b/other/NotoSerifGeorgian-Regular.otf
deleted file mode 100644
index f0186e6..0000000
--- a/other/NotoSerifGeorgian-Regular.otf
+++ /dev/null
diff --git a/other/NotoSerifGeorgian-VF.ttf b/other/NotoSerifGeorgian-VF.ttf
new file mode 100644
index 0000000..29b0eb8
--- /dev/null
+++ b/other/NotoSerifGeorgian-VF.ttf