New SettingsLibColor
Unify the color from IllustrationPreference and Spa.
Bug: 293810334
Test: m SettingsLib
Test: m SpaLib
Change-Id: I179261674237442aec668d6df8b07529cf35acc2
diff --git a/packages/SettingsLib/Color/.gitignore b/packages/SettingsLib/Color/.gitignore
new file mode 100644
index 0000000..378eac2
--- /dev/null
+++ b/packages/SettingsLib/Color/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/packages/SettingsLib/Color/Android.bp b/packages/SettingsLib/Color/Android.bp
new file mode 100644
index 0000000..713b7d9
--- /dev/null
+++ b/packages/SettingsLib/Color/Android.bp
@@ -0,0 +1,15 @@
+package {
+ default_applicable_licenses: ["frameworks_base_license"],
+}
+
+android_library {
+ name: "SettingsLibColor",
+ use_resource_processor: true,
+ sdk_version: "current",
+ min_sdk_version: "28",
+
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.permission",
+ ],
+}
diff --git a/packages/SettingsLib/Color/AndroidManifest.xml b/packages/SettingsLib/Color/AndroidManifest.xml
new file mode 100644
index 0000000..31e9d23
--- /dev/null
+++ b/packages/SettingsLib/Color/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2023 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.
+-->
+
+<manifest package="com.android.settingslib.color" />
diff --git a/packages/SettingsLib/Color/build.gradle.kts b/packages/SettingsLib/Color/build.gradle.kts
new file mode 100644
index 0000000..881bf14
--- /dev/null
+++ b/packages/SettingsLib/Color/build.gradle.kts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2023 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.
+ */
+
+plugins {
+ alias(libs.plugins.android.library)
+}
+
+android {
+ namespace = "com.android.settingslib.color"
+
+ sourceSets {
+ sourceSets.getByName("main") {
+ res.setSrcDirs(listOf("res"))
+ manifest.srcFile("AndroidManifest.xml")
+ }
+ }
+}
diff --git a/packages/SettingsLib/Spa/spa/res/values/colors.xml b/packages/SettingsLib/Color/res/values/colors.xml
similarity index 97%
rename from packages/SettingsLib/Spa/spa/res/values/colors.xml
rename to packages/SettingsLib/Color/res/values/colors.xml
index ca4a0b2..b0b9b10 100644
--- a/packages/SettingsLib/Spa/spa/res/values/colors.xml
+++ b/packages/SettingsLib/Color/res/values/colors.xml
@@ -16,8 +16,6 @@
-->
<resources>
- <color name="settingslib_protection_color">@android:color/white</color>
-
<!-- Dynamic colors-->
<color name="settingslib_color_blue600">#1a73e8</color>
<color name="settingslib_color_blue400">#669df6</color>
diff --git a/packages/SettingsLib/IllustrationPreference/Android.bp b/packages/SettingsLib/IllustrationPreference/Android.bp
index e80eb66..24ccab2 100644
--- a/packages/SettingsLib/IllustrationPreference/Android.bp
+++ b/packages/SettingsLib/IllustrationPreference/Android.bp
@@ -14,6 +14,7 @@
resource_dirs: ["res"],
static_libs: [
+ "SettingsLibColor",
"androidx.preference_preference",
"lottie",
],
diff --git a/packages/SettingsLib/IllustrationPreference/res/values/colors.xml b/packages/SettingsLib/IllustrationPreference/res/values/colors.xml
index accaa67..e53a43e 100644
--- a/packages/SettingsLib/IllustrationPreference/res/values/colors.xml
+++ b/packages/SettingsLib/IllustrationPreference/res/values/colors.xml
@@ -17,51 +17,4 @@
<resources>
<color name="settingslib_protection_color">@android:color/white</color>
-
- <!-- Dynamic colors-->
- <color name="settingslib_color_blue600">#1a73e8</color>
- <color name="settingslib_color_blue400">#669df6</color>
- <color name="settingslib_color_blue300">#8ab4f8</color>
- <color name="settingslib_color_blue100">#d2e3fc</color>
- <color name="settingslib_color_blue50">#e8f0fe</color>
- <color name="settingslib_color_green600">#1e8e3e</color>
- <color name="settingslib_color_green500">#34A853</color>
- <color name="settingslib_color_green400">#5bb974</color>
- <color name="settingslib_color_green100">#ceead6</color>
- <color name="settingslib_color_green50">#e6f4ea</color>
- <color name="settingslib_color_red600">#d93025</color>
- <color name="settingslib_color_red500">#B3261E</color>
- <color name="settingslib_color_red400">#ee675c</color>
- <color name="settingslib_color_red100">#fad2cf</color>
- <color name="settingslib_color_red50">#fce8e6</color>
- <color name="settingslib_color_yellow600">#f9ab00</color>
- <color name="settingslib_color_yellow400">#fcc934</color>
- <color name="settingslib_color_yellow100">#feefc3</color>
- <color name="settingslib_color_yellow50">#fef7e0</color>
- <color name="settingslib_color_grey900">#202124</color>
- <color name="settingslib_color_grey800">#3c4043</color>
- <color name="settingslib_color_grey700">#5f6368</color>
- <color name="settingslib_color_grey600">#80868b</color>
- <color name="settingslib_color_grey500">#9AA0A6</color>
- <color name="settingslib_color_grey400">#bdc1c6</color>
- <color name="settingslib_color_grey300">#dadce0</color>
- <color name="settingslib_color_grey200">#e8eaed</color>
- <color name="settingslib_color_grey100">#f1f3f4</color>
- <color name="settingslib_color_grey50">#f8f9fa</color>
- <color name="settingslib_color_orange600">#e8710a</color>
- <color name="settingslib_color_orange400">#fa903e</color>
- <color name="settingslib_color_orange300">#fcad70</color>
- <color name="settingslib_color_orange100">#fedfc8</color>
- <color name="settingslib_color_pink600">#e52592</color>
- <color name="settingslib_color_pink400">#ff63b8</color>
- <color name="settingslib_color_pink300">#ff8bcb</color>
- <color name="settingslib_color_pink100">#fdcfe8</color>
- <color name="settingslib_color_purple600">#9334e6</color>
- <color name="settingslib_color_purple400">#af5cf7</color>
- <color name="settingslib_color_purple300">#c58af9</color>
- <color name="settingslib_color_purple100">#e9d2fd</color>
- <color name="settingslib_color_cyan600">#12b5c8</color>
- <color name="settingslib_color_cyan400">#4ecde6</color>
- <color name="settingslib_color_cyan300">#78d9ec</color>
- <color name="settingslib_color_cyan100">#cbf0f8</color>
</resources>
diff --git a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/ColorUtils.java b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/ColorUtils.java
index 07102d5..82b7e04 100644
--- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/ColorUtils.java
+++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/ColorUtils.java
@@ -23,6 +23,8 @@
import android.graphics.PorterDuffColorFilter;
import android.util.Pair;
+import com.android.settingslib.color.R;
+
import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieProperty;
import com.airbnb.lottie.model.KeyPath;
diff --git a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java
index f166a18..0447ef8 100644
--- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java
+++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java
@@ -21,6 +21,8 @@
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
+import com.android.settingslib.color.R;
+
import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieProperty;
import com.airbnb.lottie.model.KeyPath;
diff --git a/packages/SettingsLib/Spa/settings.gradle.kts b/packages/SettingsLib/Spa/settings.gradle.kts
index 9909781..aac0fe9 100644
--- a/packages/SettingsLib/Spa/settings.gradle.kts
+++ b/packages/SettingsLib/Spa/settings.gradle.kts
@@ -40,3 +40,5 @@
include(":spa")
include(":gallery")
include(":testutils")
+include(":SettingsLibColor")
+project(":SettingsLibColor").projectDir = File(rootDir, "../Color")
diff --git a/packages/SettingsLib/Spa/spa/Android.bp b/packages/SettingsLib/Spa/spa/Android.bp
index 7f5948c..6df0e99 100644
--- a/packages/SettingsLib/Spa/spa/Android.bp
+++ b/packages/SettingsLib/Spa/spa/Android.bp
@@ -24,6 +24,7 @@
srcs: ["src/**/*.kt"],
use_resource_processor: true,
static_libs: [
+ "SettingsLibColor",
"androidx.slice_slice-builders",
"androidx.slice_slice-core",
"androidx.slice_slice-view",
diff --git a/packages/SettingsLib/Spa/spa/build.gradle.kts b/packages/SettingsLib/Spa/spa/build.gradle.kts
index 377e72ed..73ec251 100644
--- a/packages/SettingsLib/Spa/spa/build.gradle.kts
+++ b/packages/SettingsLib/Spa/spa/build.gradle.kts
@@ -52,6 +52,7 @@
}
dependencies {
+ api(project(":SettingsLibColor"))
api("androidx.appcompat:appcompat:1.7.0-alpha03")
api("androidx.slice:slice-builders:1.1.0-alpha02")
api("androidx.slice:slice-core:1.1.0-alpha02")
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt
index 5f7fe85..a6cc3a9 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/ui/Lottie.kt
@@ -33,7 +33,7 @@
import com.airbnb.lottie.compose.rememberLottieComposition
import com.airbnb.lottie.compose.rememberLottieDynamicProperties
import com.airbnb.lottie.compose.rememberLottieDynamicProperty
-import com.android.settingslib.spa.R
+import com.android.settingslib.color.R
@Composable
fun Lottie(