diff --git a/akita/device-lineage.mk b/akita/device-lineage.mk
index 7a01539..d2d9821 100644
--- a/akita/device-lineage.mk
+++ b/akita/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 += \
+    PixelDisplayServiceOverlayAkita
+
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/Android.bp b/akita/rro_overlays/PixelDisplayServiceOverlay/Android.bp
new file mode 100644
index 0000000..c3e4ce7
--- /dev/null
+++ b/akita/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: "PixelDisplayServiceOverlayAkita",
+    product_specific: true,
+}
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml b/akita/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..00ec792
--- /dev/null
+++ b/akita/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 The Android Open Source Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.pixeldisplayservice.overlay.akita">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="1"
+        android:targetPackage="com.android.pixeldisplayservice" />
+</manifest>
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_0_cal0.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_0_cal0.png
new file mode 100644
index 0000000..4757e46
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_0_cal0.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_1_cal0.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_1_cal0.png
new file mode 100644
index 0000000..4757e46
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_1_cal0.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_2_cal0.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_2_cal0.png
new file mode 100644
index 0000000..4757e46
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_2_cal0.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_3_cal0.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_3_cal0.png
new file mode 100644
index 0000000..b92eacc
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_3_cal0.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_4_cal0.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_4_cal0.png
new file mode 100644
index 0000000..b92eacc
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_4_cal0.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_5_cal0.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_5_cal0.png
new file mode 100644
index 0000000..b92eacc
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/SCI_5_cal0.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9162.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9162.png
new file mode 100644
index 0000000..7f0f52a
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9162.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7588.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7588.png
new file mode 100644
index 0000000..fd631fd
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7588.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7475.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7475.png
new file mode 100644
index 0000000..15ff4d5
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7475.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7362.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7362.png
new file mode 100644
index 0000000..e2e7e2a
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7362.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_13_ZA7250.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_13_ZA7250.png
new file mode 100644
index 0000000..93c62e7
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_13_ZA7250.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA8938.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA8938.png
new file mode 100644
index 0000000..e7107b7
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA8938.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA8712.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA8712.png
new file mode 100644
index 0000000..7b262b4
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA8712.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8488.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8488.png
new file mode 100644
index 0000000..c062f83
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8488.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8375.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8375.png
new file mode 100644
index 0000000..b94656d
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8375.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8262.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8262.png
new file mode 100644
index 0000000..35bba68
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8262.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8150.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8150.png
new file mode 100644
index 0000000..9b9bc75
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8150.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8038.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8038.png
new file mode 100644
index 0000000..c3d6301
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8038.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA7812.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA7812.png
new file mode 100644
index 0000000..cfda15a
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA7812.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA7700.png b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA7700.png
new file mode 100644
index 0000000..ac65014
Binary files /dev/null and b/akita/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA7700.png differ
diff --git a/akita/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml b/akita/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
new file mode 100644
index 0000000..f23e3c8
--- /dev/null
+++ b/akita/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 The Android Open Source Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <array name="config_za_compensation_brightness_thresholds_list">
+        <item>@array/config_za_primary_display_brightness_thresholds_list</item>
+    </array>
+    <array name="config_za_compensation_images_list">
+        <item>@array/config_za_primary_display_compensation_images_list</item>
+    </array>
+    <array name="config_za_compensation_opr_thresholds">
+        <item>0.4</item>
+    </array>
+    <array name="config_za_compensation_with_shadow_compensation_images">
+        <item>@drawable/SCI_0_cal0</item>
+        <item>@drawable/SCI_1_cal0</item>
+        <item>@drawable/SCI_2_cal0</item>
+        <item>@drawable/SCI_3_cal0</item>
+        <item>@drawable/SCI_4_cal0</item>
+        <item>@drawable/SCI_5_cal0</item>
+    </array>
+    <integer-array name="config_za_compensation_with_shadow_compensation_thresholds">
+        <item>7000</item>
+        <item>10000</item>
+        <item>35000</item>
+        <item>50000</item>
+        <item>80000</item>
+        <item>100000</item>
+    </integer-array>
+    <array name="config_za_primary_display_brightness_thresholds_list">
+        <item>@array/config_za_primary_display_condition1_brightness_thresholds</item>
+        <item>@array/config_za_primary_display_condition2_brightness_thresholds</item>
+    </array>
+    <array name="config_za_primary_display_compensation_images_list">
+        <item>@array/config_za_primary_display_condition1_compensation_images</item>
+        <item>@array/config_za_primary_display_condition2_compensation_images</item>
+    </array>
+    <array name="config_za_primary_display_condition1_brightness_thresholds">
+        <item>0.60714287</item>
+        <item>0.625</item>
+        <item>0.64285713</item>
+        <item>0.66071427</item>
+        <item>0.6785714</item>
+        <item>0.71428573</item>
+        <item>0.75</item>
+        <item>0.85714287</item>
+        <item>0.9285714</item>
+        <item>0.9464286</item>
+        <item>0.96428573</item>
+        <item>0.98214287</item>
+        <item>1.0</item>
+    </array>
+    <array name="config_za_primary_display_condition1_compensation_images">
+        <item>@drawable/ZACI_0_ZA9162</item>
+        <item>@drawable/ZACI_1_ZA8938</item>
+        <item>@drawable/ZACI_2_ZA8712</item>
+        <item>@drawable/ZACI_3_ZA8488</item>
+        <item>@drawable/ZACI_5_ZA8262</item>
+        <item>@drawable/ZACI_6_ZA8150</item>
+        <item>@drawable/ZACI_7_ZA8038</item>
+        <item>@drawable/ZACI_8_ZA7812</item>
+        <item>@drawable/ZACI_9_ZA7700</item>
+        <item>@drawable/ZACI_10_ZA7588</item>
+        <item>@drawable/ZACI_11_ZA7475</item>
+        <item>@drawable/ZACI_12_ZA7362</item>
+        <item>@drawable/ZACI_13_ZA7250</item>
+    </array>
+    <array name="config_za_primary_display_condition2_brightness_thresholds">
+        <item>0.57214284</item>
+        <item>0.75</item>
+        <item>0.78571427</item>
+        <item>0.8214286</item>
+        <item>0.85714287</item>
+        <item>0.9285714</item>
+        <item>0.96428573</item>
+        <item>0.98214287</item>
+        <item>1.0</item>
+    </array>
+    <array name="config_za_primary_display_condition2_compensation_images">
+        <item>@drawable/ZACI_0_ZA9162</item>
+        <item>@drawable/ZACI_1_ZA8938</item>
+        <item>@drawable/ZACI_2_ZA8712</item>
+        <item>@drawable/ZACI_3_ZA8488</item>
+        <item>@drawable/ZACI_4_ZA8375</item>
+        <item>@drawable/ZACI_6_ZA8150</item>
+        <item>@drawable/ZACI_7_ZA8038</item>
+        <item>@drawable/ZACI_8_ZA7812</item>
+        <item>@drawable/ZACI_10_ZA7588</item>
+    </array>
+    <bool name="config_compensation_animation_enabled">true</bool>
+    <item type="dimen" name="config_compensation_filter_intercept">10.0</item>
+    <item type="dimen" name="config_za_compensation_brightness_enter_threshold">0.5</item>
+    <integer name="config_ambient_brightness_changed_debounce_ms">500</integer>
+    <integer name="config_compensation_filter_horizon">1500</integer>
+</resources>