diff --git a/husky/device-lineage.mk b/husky/device-lineage.mk
index 7a01539..8d14a87 100644
--- a/husky/device-lineage.mk
+++ b/husky/device-lineage.mk
@@ -8,4 +8,7 @@ $(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
+PRODUCT_PACKAGES += \
+ PixelDisplayServiceOverlayHusky
+
TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/Android.bp b/husky/rro_overlays/PixelDisplayServiceOverlay/Android.bp
new file mode 100644
index 0000000..c14fce0
--- /dev/null
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2024 The Android Open Source Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+ name: "PixelDisplayServiceOverlayHusky",
+ product_specific: true,
+}
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml b/husky/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..d65dc59
--- /dev/null
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9595.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9595.png
new file mode 100644
index 0000000..79d78ed
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9595.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7824.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7824.png
new file mode 100644
index 0000000..9aa85e0
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7824.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7638.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7638.png
new file mode 100644
index 0000000..2e2f9bc
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7638.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7452.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7452.png
new file mode 100644
index 0000000..9878f3c
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7452.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_13_ZA7359.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_13_ZA7359.png
new file mode 100644
index 0000000..bb6327a
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_13_ZA7359.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_14_ZA7266.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_14_ZA7266.png
new file mode 100644
index 0000000..1c5a0dd
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_14_ZA7266.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_15_ZA7079.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_15_ZA7079.png
new file mode 100644
index 0000000..e1749fa
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_15_ZA7079.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_16_ZA6893.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_16_ZA6893.png
new file mode 100644
index 0000000..619eecc
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_16_ZA6893.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_17_ZA6800.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_17_ZA6800.png
new file mode 100644
index 0000000..a5a9a5c
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_17_ZA6800.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA9314.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA9314.png
new file mode 100644
index 0000000..b3243fb
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA9314.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA9128.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA9128.png
new file mode 100644
index 0000000..6554799
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA9128.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8941.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8941.png
new file mode 100644
index 0000000..39a208d
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8941.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8755.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8755.png
new file mode 100644
index 0000000..17264c9
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8755.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8476.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8476.png
new file mode 100644
index 0000000..a71ceda
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8476.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8383.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8383.png
new file mode 100644
index 0000000..ef22153
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8383.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8197.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8197.png
new file mode 100644
index 0000000..38dd143
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8197.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA8103.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA8103.png
new file mode 100644
index 0000000..65c6f36
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA8103.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA8010.png b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA8010.png
new file mode 100644
index 0000000..84f33cd
Binary files /dev/null and b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA8010.png differ
diff --git a/husky/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml b/husky/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
new file mode 100644
index 0000000..30e79a2
--- /dev/null
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
@@ -0,0 +1,96 @@
+
+
+
+
+ - @array/config_za_primary_display_brightness_thresholds_list
+
+
+ - @array/config_za_primary_display_compensation_images_list
+
+
+ - 0.17
+ - 0.4
+
+
+ - @array/config_za_primary_display_condition1_brightness_thresholds
+ - @array/config_za_primary_display_condition2_brightness_thresholds
+
+
+ - @array/config_za_primary_display_condition1_compensation_images
+ - @array/config_za_primary_display_condition2_compensation_images
+
+
+ - 0.53125
+ - 0.546875
+ - 0.5625
+ - 0.578125
+ - 0.59375
+ - 0.671875
+ - 0.75
+ - 0.8125
+ - 0.875
+ - 0.9375
+ - 1.0
+
+
+ - @drawable/ZACI_2_ZA9128
+ - @drawable/ZACI_3_ZA8941
+ - @drawable/ZACI_4_ZA8755
+ - @drawable/ZACI_5_ZA8476
+ - @drawable/ZACI_7_ZA8197
+ - @drawable/ZACI_9_ZA8010
+ - @drawable/ZACI_10_ZA7824
+ - @drawable/ZACI_11_ZA7638
+ - @drawable/ZACI_13_ZA7359
+ - @drawable/ZACI_15_ZA7079
+ - @drawable/ZACI_17_ZA6800
+
+
+ - 0.53125
+ - 0.578125
+ - 0.625
+ - 0.65625
+ - 0.6875
+ - 0.71875
+ - 0.75
+ - 0.8125
+ - 0.828125
+ - 0.84375
+ - 0.859375
+ - 0.875
+ - 0.890625
+ - 0.90625
+ - 0.921875
+ - 0.9375
+ - 0.96875
+ - 1.0
+
+
+ - @drawable/ZACI_0_ZA9595
+ - @drawable/ZACI_1_ZA9314
+ - @drawable/ZACI_2_ZA9128
+ - @drawable/ZACI_3_ZA8941
+ - @drawable/ZACI_4_ZA8755
+ - @drawable/ZACI_5_ZA8476
+ - @drawable/ZACI_6_ZA8383
+ - @drawable/ZACI_7_ZA8197
+ - @drawable/ZACI_8_ZA8103
+ - @drawable/ZACI_9_ZA8010
+ - @drawable/ZACI_10_ZA7824
+ - @drawable/ZACI_11_ZA7638
+ - @drawable/ZACI_12_ZA7452
+ - @drawable/ZACI_13_ZA7359
+ - @drawable/ZACI_14_ZA7266
+ - @drawable/ZACI_15_ZA7079
+ - @drawable/ZACI_16_ZA6893
+ - @drawable/ZACI_17_ZA6800
+
+ true
+ - 10.0
+ - 0.5
+ 500
+ 1500
+
diff --git a/shiba/device-lineage.mk b/shiba/device-lineage.mk
index 7a01539..7a4dec3 100644
--- a/shiba/device-lineage.mk
+++ b/shiba/device-lineage.mk
@@ -8,4 +8,7 @@ $(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
+PRODUCT_PACKAGES += \
+ PixelDisplayServiceOverlayShiba
+
TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/Android.bp b/shiba/rro_overlays/PixelDisplayServiceOverlay/Android.bp
new file mode 100644
index 0000000..776ece3
--- /dev/null
+++ b/shiba/rro_overlays/PixelDisplayServiceOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2024 The Android Open Source Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+ name: "PixelDisplayServiceOverlayShiba",
+ product_specific: true,
+}
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml b/shiba/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..d0e9df0
--- /dev/null
+++ b/shiba/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_1_cal0.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_1_cal0.png
new file mode 100644
index 0000000..dda2145
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_1_cal0.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_2_cal0.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_2_cal0.png
new file mode 100644
index 0000000..232cc13
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_2_cal0.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_3_cal0.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_3_cal0.png
new file mode 100644
index 0000000..70d1dca
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_3_cal0.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_4_cal0.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_4_cal0.png
new file mode 100644
index 0000000..9094e59
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_4_cal0.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9595.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9595.png
new file mode 100644
index 0000000..ead1cf1
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9595.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7824.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7824.png
new file mode 100644
index 0000000..f798f5a
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7824.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7638.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7638.png
new file mode 100644
index 0000000..b9f2299
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7638.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7266.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7266.png
new file mode 100644
index 0000000..34c7412
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7266.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA9314.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA9314.png
new file mode 100644
index 0000000..797ff2b
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA9314.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA9128.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA9128.png
new file mode 100644
index 0000000..8261ad8
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA9128.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8941.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8941.png
new file mode 100644
index 0000000..7746688
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8941.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8755.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8755.png
new file mode 100644
index 0000000..574afd1
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8755.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8476.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8476.png
new file mode 100644
index 0000000..3668d2c
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8476.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8383.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8383.png
new file mode 100644
index 0000000..b3c2d8e
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8383.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8197.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8197.png
new file mode 100644
index 0000000..9ea58f6
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8197.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA8103.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA8103.png
new file mode 100644
index 0000000..c20d837
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA8103.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA8010.png b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA8010.png
new file mode 100644
index 0000000..4293502
Binary files /dev/null and b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA8010.png differ
diff --git a/shiba/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
new file mode 100644
index 0000000..9b84345
--- /dev/null
+++ b/shiba/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
@@ -0,0 +1,94 @@
+
+
+
+
+ - @array/config_za_primary_display_brightness_thresholds_list
+
+
+ - @array/config_za_primary_display_compensation_images_list
+
+
+ - 0.4
+
+
+ - @drawable/SCI_1_cal0
+ - @drawable/SCI_2_cal0
+ - @drawable/SCI_3_cal0
+ - @drawable/SCI_4_cal0
+
+
+ - 50000
+ - 65000
+ - 80000
+ - 95000
+
+
+ - @array/config_za_primary_display_condition1_brightness_thresholds
+ - @array/config_za_primary_display_condition2_brightness_thresholds
+
+
+ - @array/config_za_primary_display_condition1_compensation_images
+ - @array/config_za_primary_display_condition2_compensation_images
+
+
+ - 0.60714287
+ - 0.625
+ - 0.64285713
+ - 0.66071427
+ - 0.6785714
+ - 0.76785713
+ - 0.85714287
+ - 0.9285714
+ - 1.0
+
+
+ - @drawable/ZACI_2_ZA9128
+ - @drawable/ZACI_3_ZA8941
+ - @drawable/ZACI_4_ZA8755
+ - @drawable/ZACI_5_ZA8476
+ - @drawable/ZACI_7_ZA8197
+ - @drawable/ZACI_9_ZA8010
+ - @drawable/ZACI_7_ZA8197
+ - @drawable/ZACI_10_ZA7824
+ - @drawable/ZACI_12_ZA7266
+
+
+ - 0.60714287
+ - 0.625
+ - 0.71428573
+ - 0.71428573
+ - 0.78571427
+ - 0.8214286
+ - 0.85714287
+ - 0.9285714
+ - 0.9464286
+ - 0.96428573
+ - 0.98214287
+ - 1.0
+
+
+ - @drawable/ZACI_0_ZA9595
+ - @drawable/ZACI_1_ZA9314
+ - @drawable/ZACI_2_ZA9128
+ - @drawable/ZACI_3_ZA8941
+ - @drawable/ZACI_4_ZA8755
+ - @drawable/ZACI_5_ZA8476
+ - @drawable/ZACI_6_ZA8383
+ - @drawable/ZACI_7_ZA8197
+ - @drawable/ZACI_8_ZA8103
+ - @drawable/ZACI_9_ZA8010
+ - @drawable/ZACI_10_ZA7824
+ - @drawable/ZACI_11_ZA7638
+
+
+ - SB3-0
+
+ true
+ - 10.0
+ - 0.5714286
+ 500
+ 1500
+