OmniControl: set custom dark accent also to system_accent1_200
DynamiColors is using that as default for dark primary
Change-Id: I3abafb2e783f93de774deaa1fb49b08f29dc2f74
diff --git a/app/src/main/java/org/omnirom/control/OverlaysProvider.kt b/app/src/main/java/org/omnirom/control/OverlaysProvider.kt
index 1d777bc..49191d4 100644
--- a/app/src/main/java/org/omnirom/control/OverlaysProvider.kt
+++ b/app/src/main/java/org/omnirom/control/OverlaysProvider.kt
@@ -253,6 +253,11 @@
accentColor.darkColor
)
.setResourceValue(
+ "@android:color/system_accent1_200",
+ TypedValue.TYPE_INT_COLOR_ARGB8,
+ accentColor.darkColor
+ )
+ .setResourceValue(
"@android:color/system_accent1_600",
TypedValue.TYPE_INT_COLOR_ARGB8,
accentColor.lightColor
@@ -266,39 +271,6 @@
}
}
- fun createFabricatedAccentOverlay(color: Int, name: String) {
- if (om != null) {
- val accentColorOverlay = FabricatedOverlay.Builder(
- context.packageName, name, "android"
- )
- .setResourceValue(
- "@android:color/system_accent1_100",
- TypedValue.TYPE_INT_COLOR_ARGB8,
- color
- )
- .setResourceValue(
- "@android:color/system_accent1_600",
- TypedValue.TYPE_INT_COLOR_ARGB8,
- color
- )
- .build()
-
- // disable all others
- val transaction = OverlayManagerTransaction.Builder()
- getCategoryOverlaysRaw(getAccentColorCategory()).filter { it.isEnabled() }
- .forEach {
- transaction.setEnabled(
- it.getOverlayIdentifier(),
- false,
- UserHandle.myUserId()
- )
- }
- transaction.registerFabricatedOverlay(accentColorOverlay)
- .setEnabled(accentColorOverlay!!.getIdentifier(), true, UserHandle.myUserId())
- om!!.commit(transaction.build())
- }
- }
-
fun getFabricatedOverlayIdentifier(overlayName: String): String {
return OverlayIdentifier(context.packageName, overlayName).toString()
}
diff --git a/app/src/main/res/drawable/check_circle_shape.xml b/app/src/main/res/drawable/check_circle_shape.xml
index fe96cf0..1589fad 100644
--- a/app/src/main/res/drawable/check_circle_shape.xml
+++ b/app/src/main/res/drawable/check_circle_shape.xml
@@ -1,7 +1,7 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:tint="@android:color/white"
+ android:tint="?attr/colorOnPrimary"
android:viewportWidth="24"
android:viewportHeight="24">
<path