Use Launcher aconfig flag in Resource file.
Use BaseIconRoot as an example. Also add bpfmt file formatting.
Bug: 393609690
Test: Verified compilation worked well and font actually built
successfully in both gradle and make.
Flag: com.android.launcher3.google_sans_flex_font
Change-Id: I2200d13a8d57e5d046a35226f08a751add937ca7
diff --git a/Android.bp b/Android.bp
index a4a058f..dccbf2f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -408,6 +408,9 @@
lint: {
baseline_filename: "lint-baseline.xml",
},
+ flags_packages: [
+ "com_android_launcher3_flags",
+ ],
}
//
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 6948133..768ba65 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,8 +1,10 @@
[Builtin Hooks]
ktfmt = true
+bpfmt = true
[Builtin Hooks Options]
ktfmt = --kotlinlang-style
+bpfmt = -d
[Tool Paths]
ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh
diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig
index cc746eb..6893b1f 100644
--- a/aconfig/launcher.aconfig
+++ b/aconfig/launcher.aconfig
@@ -566,6 +566,14 @@
}
flag {
+ name: "google_sans_flex_font"
+ namespace: "launcher"
+ description: "Adds refresh for font family. Needs to be fixed to be used in resources."
+ bug: "395145453"
+ is_fixed_read_only: true
+}
+
+flag {
name: "restore_archived_shortcuts"
namespace: "launcher"
description: "Makes sure pre-archived pinned shortcuts also get restored"