accents: Redo for compatibility with ThemePicker
Change-Id: I23764df144be22419d6464eb763dc98f73b6fdea
diff --git a/accents/black/Android.mk b/accents/black/Android.mk
index ed759ab..d1c584b 100644
--- a/accents/black/Android.mk
+++ b/accents/black/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineageBlackAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineageBlackAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/black/AndroidManifest.xml b/accents/black/AndroidManifest.xml
index 1c10c30..c462a50 100644
--- a/accents/black/AndroidManifest.xml
+++ b/accents/black/AndroidManifest.xml
@@ -20,18 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_black">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#212121" />
-
- <meta-data
- android:name="lineage_berry_accent_supported_styles"
- android:value="light" />
- </application>
+ android:label="@string/accent_color_black_overlay" />
</manifest>
diff --git a/accents/black/res/values/colors.xml b/accents/black/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/black/res/values/colors.xml
rename to accents/black/res/values/colors_device_defaults.xml
index 26120bc..2abf156 100644
--- a/accents/black/res/values/colors.xml
+++ b/accents/black/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#212121</color>
- <color name="accent_device_default_dark">#212121</color>
<color name="accent_device_default_light">#212121</color>
- <color name="material_deep_teal_200">#212121</color>
- <color name="material_deep_teal_500">#212121</color>
- <color name="notification_icon_bg_color">#212121</color>
- <color name="system_notification_accent_color">#212121</color>
+ <color name="accent_device_default_dark">#212121</color>
</resources>
diff --git a/accents/black/res/values/strings.xml b/accents/black/res/values/strings.xml
new file mode 100644
index 0000000..4964bf5
--- /dev/null
+++ b/accents/black/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Black accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_black_overlay" translatable="false">Black</string>
+</resources>
+
diff --git a/accents/blue/Android.mk b/accents/blue/Android.mk
index b3c2264..5992548 100644
--- a/accents/blue/Android.mk
+++ b/accents/blue/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineageBlueAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineageBlueAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/blue/AndroidManifest.xml b/accents/blue/AndroidManifest.xml
index 0d401bd..4672296 100644
--- a/accents/blue/AndroidManifest.xml
+++ b/accents/blue/AndroidManifest.xml
@@ -20,14 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_blue">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#4182EF" />
- </application>
+ android:label="@string/accent_color_blue_overlay" />
</manifest>
diff --git a/accents/blue/res/values/colors.xml b/accents/blue/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/blue/res/values/colors.xml
rename to accents/blue/res/values/colors_device_defaults.xml
index c9c1980..1233518 100644
--- a/accents/blue/res/values/colors.xml
+++ b/accents/blue/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#4182EF</color>
- <color name="accent_device_default_dark">#4182EF</color>
<color name="accent_device_default_light">#4182EF</color>
- <color name="material_deep_teal_200">#4182EF</color>
- <color name="material_deep_teal_500">#4182EF</color>
- <color name="notification_icon_bg_color">#4182EF</color>
- <color name="system_notification_accent_color">#4182EF</color>
+ <color name="accent_device_default_dark">#4182EF</color>
</resources>
diff --git a/accents/blue/res/values/strings.xml b/accents/blue/res/values/strings.xml
new file mode 100644
index 0000000..3951764
--- /dev/null
+++ b/accents/blue/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Blue accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_blue_overlay" translatable="false">Blue</string>
+</resources>
+
diff --git a/accents/brown/Android.mk b/accents/brown/Android.mk
index 67c19d3..c155e5b 100644
--- a/accents/brown/Android.mk
+++ b/accents/brown/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineageBrownAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineageBrownAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/brown/AndroidManifest.xml b/accents/brown/AndroidManifest.xml
index 041777b..73d8c58 100644
--- a/accents/brown/AndroidManifest.xml
+++ b/accents/brown/AndroidManifest.xml
@@ -18,17 +18,12 @@
android:versionCode="1"
android:versionName="1.0">
- <overlay
- android:targetPackage="android"
- android:label="@*lineageos.platform:string/accent_brown"
- android:priority="1" />
+ <overlay
+ android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
+ android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_brown">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#996A5A" />
- </application>
+ android:label="@string/accent_color_brown_overlay" />
</manifest>
diff --git a/accents/brown/res/values/colors.xml b/accents/brown/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/brown/res/values/colors.xml
rename to accents/brown/res/values/colors_device_defaults.xml
index 9a6e855..226a032 100644
--- a/accents/brown/res/values/colors.xml
+++ b/accents/brown/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#996A5A</color>
- <color name="accent_device_default_dark">#996A5A</color>
<color name="accent_device_default_light">#996A5A</color>
- <color name="material_deep_teal_200">#996A5A</color>
- <color name="material_deep_teal_500">#996A5A</color>
- <color name="notification_icon_bg_color">#996A5A</color>
- <color name="system_notification_accent_color">#996A5A</color>
+ <color name="accent_device_default_dark">#996A5A</color>
</resources>
diff --git a/accents/brown/res/values/strings.xml b/accents/brown/res/values/strings.xml
new file mode 100644
index 0000000..01d924e
--- /dev/null
+++ b/accents/brown/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Brown accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_brown_overlay" translatable="false">Brown</string>
+</resources>
+
diff --git a/accents/cyan/Android.mk b/accents/cyan/Android.mk
index b5d040b..78e0e8f 100644
--- a/accents/cyan/Android.mk
+++ b/accents/cyan/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineageCyanAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineageCyanAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/cyan/AndroidManifest.xml b/accents/cyan/AndroidManifest.xml
index d38a26f..5a9fb1d 100644
--- a/accents/cyan/AndroidManifest.xml
+++ b/accents/cyan/AndroidManifest.xml
@@ -20,14 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_cyan">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#00B1E5" />
- </application>
+ android:label="@string/accent_color_cyan_overlay" />
</manifest>
diff --git a/accents/cyan/res/values/colors.xml b/accents/cyan/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/cyan/res/values/colors.xml
rename to accents/cyan/res/values/colors_device_defaults.xml
index 957531a..032e90b 100644
--- a/accents/cyan/res/values/colors.xml
+++ b/accents/cyan/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#00B1E5</color>
- <color name="accent_device_default_dark">#00B1E5</color>
<color name="accent_device_default_light">#00B1E5</color>
- <color name="material_deep_teal_200">#00B1E5</color>
- <color name="material_deep_teal_500">#00B1E5</color>
- <color name="notification_icon_bg_color">#00B1E5</color>
- <color name="system_notification_accent_color">#00B1E5</color>
+ <color name="accent_device_default_dark">#00B1E5</color>
</resources>
diff --git a/accents/cyan/res/values/strings.xml b/accents/cyan/res/values/strings.xml
new file mode 100644
index 0000000..ca4cbfa
--- /dev/null
+++ b/accents/cyan/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Cyan accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_cyan_overlay" translatable="false">Cyan</string>
+</resources>
+
diff --git a/accents/green/Android.mk b/accents/green/Android.mk
index 63084c0..1dc21cf 100644
--- a/accents/green/Android.mk
+++ b/accents/green/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineageGreenAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineageGreenAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/green/AndroidManifest.xml b/accents/green/AndroidManifest.xml
index 6b104ce..23bdc5b 100644
--- a/accents/green/AndroidManifest.xml
+++ b/accents/green/AndroidManifest.xml
@@ -20,14 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_green">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#38853B" />
- </application>
+ android:label="@string/accent_color_green_overlay" />
</manifest>
diff --git a/accents/green/res/values/colors.xml b/accents/green/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/green/res/values/colors.xml
rename to accents/green/res/values/colors_device_defaults.xml
index c8e4800..32c026b 100644
--- a/accents/green/res/values/colors.xml
+++ b/accents/green/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#38853B</color>
- <color name="accent_device_default_dark">#38853B</color>
<color name="accent_device_default_light">#38853B</color>
- <color name="material_deep_teal_200">#38853B</color>
- <color name="material_deep_teal_500">#38853B</color>
- <color name="notification_icon_bg_color">#38853B</color>
- <color name="system_notification_accent_color">#38853B</color>
+ <color name="accent_device_default_dark">#38853B</color>
</resources>
diff --git a/accents/green/res/values/strings.xml b/accents/green/res/values/strings.xml
new file mode 100644
index 0000000..6bd772d
--- /dev/null
+++ b/accents/green/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Green accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_green_overlay" translatable="false">Green</string>
+</resources>
+
diff --git a/accents/orange/Android.mk b/accents/orange/Android.mk
index dfedd38..a53647c 100644
--- a/accents/orange/Android.mk
+++ b/accents/orange/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineageOrangeAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineageOrangeAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/orange/AndroidManifest.xml b/accents/orange/AndroidManifest.xml
index 3db3ff4..8696a5f 100644
--- a/accents/orange/AndroidManifest.xml
+++ b/accents/orange/AndroidManifest.xml
@@ -20,14 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_orange">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#FF5722" />
- </application>
+ android:label="@string/accent_color_orange_overlay" />
</manifest>
diff --git a/accents/orange/res/values/colors.xml b/accents/orange/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/orange/res/values/colors.xml
rename to accents/orange/res/values/colors_device_defaults.xml
index aa1d239..267bd0b 100644
--- a/accents/orange/res/values/colors.xml
+++ b/accents/orange/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#FF5722</color>
- <color name="accent_device_default_dark">#FF5722</color>
<color name="accent_device_default_light">#FF5722</color>
- <color name="material_deep_teal_200">#FF5722</color>
- <color name="material_deep_teal_500">#FF5722</color>
- <color name="notification_icon_bg_color">#FF5722</color>
- <color name="system_notification_accent_color">#FF5722</color>
+ <color name="accent_device_default_dark">#FF5722</color>
</resources>
diff --git a/accents/orange/res/values/strings.xml b/accents/orange/res/values/strings.xml
new file mode 100644
index 0000000..09d988b
--- /dev/null
+++ b/accents/orange/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Orange accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_orange_overlay" translatable="false">Orange</string>
+</resources>
+
diff --git a/accents/pink/Android.mk b/accents/pink/Android.mk
index 0b8e428..06a199b 100644
--- a/accents/pink/Android.mk
+++ b/accents/pink/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineagePinkAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineagePinkAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/pink/AndroidManifest.xml b/accents/pink/AndroidManifest.xml
index f1f6817..789a36d 100644
--- a/accents/pink/AndroidManifest.xml
+++ b/accents/pink/AndroidManifest.xml
@@ -20,14 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_pink">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#E6125E" />
- </application>
+ android:label="@string/accent_color_pink_overlay" />
</manifest>
diff --git a/accents/pink/res/values/colors.xml b/accents/pink/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/pink/res/values/colors.xml
rename to accents/pink/res/values/colors_device_defaults.xml
index 0bb1c33..f517d28 100644
--- a/accents/pink/res/values/colors.xml
+++ b/accents/pink/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#E6125E</color>
- <color name="accent_device_default_dark">#E6125E</color>
<color name="accent_device_default_light">#E6125E</color>
- <color name="material_deep_teal_200">#E6125E</color>
- <color name="material_deep_teal_500">#E6125E</color>
- <color name="notification_icon_bg_color">#E6125E</color>
- <color name="system_notification_accent_color">#E6125E</color>
+ <color name="accent_device_default_dark">#E6125E</color>
</resources>
diff --git a/accents/pink/res/values/strings.xml b/accents/pink/res/values/strings.xml
new file mode 100644
index 0000000..ed7eb39
--- /dev/null
+++ b/accents/pink/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Pink accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_pink_overlay" translatable="false">Pink</string>
+</resources>
+
diff --git a/accents/purple/Android.mk b/accents/purple/Android.mk
index 0a3677b..af537da 100644
--- a/accents/purple/Android.mk
+++ b/accents/purple/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineagePurpleAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineagePurpleAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/purple/AndroidManifest.xml b/accents/purple/AndroidManifest.xml
index d3904b5..1ae11b6 100644
--- a/accents/purple/AndroidManifest.xml
+++ b/accents/purple/AndroidManifest.xml
@@ -20,14 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_purple">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#673AB7" />
- </application>
+ android:label="@string/accent_color_purple_overlay" />
</manifest>
diff --git a/accents/purple/res/values/colors.xml b/accents/purple/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/purple/res/values/colors.xml
rename to accents/purple/res/values/colors_device_defaults.xml
index 125dd75..f817dcb 100644
--- a/accents/purple/res/values/colors.xml
+++ b/accents/purple/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#673AB7</color>
- <color name="accent_device_default_dark">#673AB7</color>
<color name="accent_device_default_light">#673AB7</color>
- <color name="material_deep_teal_200">#673AB7</color>
- <color name="material_deep_teal_500">#673AB7</color>
- <color name="notification_icon_bg_color">#673AB7</color>
- <color name="system_notification_accent_color">#673AB7</color>
+ <color name="accent_device_default_dark">#673AB7</color>
</resources>
diff --git a/accents/purple/res/values/strings.xml b/accents/purple/res/values/strings.xml
new file mode 100644
index 0000000..4abe7f7
--- /dev/null
+++ b/accents/purple/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Purple accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_purple_overlay" translatable="false">Purple</string>
+</resources>
+
diff --git a/accents/red/Android.mk b/accents/red/Android.mk
index d297312..ad43897 100644
--- a/accents/red/Android.mk
+++ b/accents/red/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineageRedAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineageRedAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/red/AndroidManifest.xml b/accents/red/AndroidManifest.xml
index 15a12a2..e103f4a 100644
--- a/accents/red/AndroidManifest.xml
+++ b/accents/red/AndroidManifest.xml
@@ -20,14 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_red">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#D0422D" />
- </application>
+ android:label="@string/accent_color_red_overlay" />
</manifest>
diff --git a/accents/red/res/values/colors.xml b/accents/red/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/red/res/values/colors.xml
rename to accents/red/res/values/colors_device_defaults.xml
index 60a1496..09a62a8 100644
--- a/accents/red/res/values/colors.xml
+++ b/accents/red/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#D0422D</color>
- <color name="accent_device_default_dark">#D0422D</color>
<color name="accent_device_default_light">#D0422D</color>
- <color name="material_deep_teal_200">#D0422D</color>
- <color name="material_deep_teal_500">#D0422D</color>
- <color name="notification_icon_bg_color">#D0422D</color>
- <color name="system_notification_accent_color">#D0422D</color>
+ <color name="accent_device_default_dark">#D0422D</color>
</resources>
diff --git a/accents/red/res/values/strings.xml b/accents/red/res/values/strings.xml
new file mode 100644
index 0000000..9c0edf9
--- /dev/null
+++ b/accents/red/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Red accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_red_overlay" translatable="false">Red</string>
+</resources>
+
diff --git a/accents/yellow/Android.mk b/accents/yellow/Android.mk
index 9a1c646..afeb67c 100644
--- a/accents/yellow/Android.mk
+++ b/accents/yellow/Android.mk
@@ -2,10 +2,11 @@
include $(CLEAR_VARS)
LOCAL_RRO_THEME := LineageYellowAccent
+LOCAL_PRODUCT_MODULE := true
LOCAL_CERTIFICATE := platform
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := LineageYellowAccent
LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_RRO_SYSTEM_PACKAGE)
+include $(BUILD_RRO_PACKAGE)
diff --git a/accents/yellow/AndroidManifest.xml b/accents/yellow/AndroidManifest.xml
index faa336f..9abbd02 100644
--- a/accents/yellow/AndroidManifest.xml
+++ b/accents/yellow/AndroidManifest.xml
@@ -20,14 +20,10 @@
<overlay
android:targetPackage="android"
+ android:category="android.theme.customization.accent_color"
android:priority="1" />
<application
android:hasCode="false"
- android:label="@*lineageos.platform:string/accent_yellow">
-
- <meta-data
- android:name="lineage_berry_accent_preview"
- android:value="#F4AC45" />
- </application>
+ android:label="@string/accent_color_yellow_overlay" />
</manifest>
diff --git a/accents/yellow/res/values/colors.xml b/accents/yellow/res/values/colors_device_defaults.xml
similarity index 68%
rename from accents/yellow/res/values/colors.xml
rename to accents/yellow/res/values/colors_device_defaults.xml
index dfdb0e4..3fda257 100644
--- a/accents/yellow/res/values/colors.xml
+++ b/accents/yellow/res/values/colors_device_defaults.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (c) 2018, The LineageOS Project
+ Copyright (c) 2019, The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
limitations under the License.
-->
<resources>
- <color name="accent_device_default_700">#F4AC45</color>
- <color name="accent_device_default_dark">#F4AC45</color>
<color name="accent_device_default_light">#F4AC45</color>
- <color name="material_deep_teal_200">#F4AC45</color>
- <color name="material_deep_teal_500">#F4AC45</color>
- <color name="notification_icon_bg_color">#F4AC45</color>
- <color name="system_notification_accent_color">#F4AC45</color>
+ <color name="accent_device_default_dark">#F4AC45</color>
</resources>
diff --git a/accents/yellow/res/values/strings.xml b/accents/yellow/res/values/strings.xml
new file mode 100644
index 0000000..7198b8b
--- /dev/null
+++ b/accents/yellow/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2019, The LineageOS 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Yellow accent color name application label. [CHAR LIMIT=50] -->
+ <string name="accent_color_yellow_overlay" translatable="false">Yellow</string>
+</resources>
+