diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml
index 5760eb7..e64fa26 100644
--- a/audio/comet/aidl_config/audio_platform_configuration.xml
+++ b/audio/comet/aidl_config/audio_platform_configuration.xml
@@ -113,6 +113,212 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/device-comet.mk b/device-comet.mk
index 32cae1e..cd4cb07 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -245,6 +245,10 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
GRilServiceOverlay_CT3
+# Settings Overlay
+PRODUCT_PACKAGES += \
+ SettingsCometOverlay
+
# Graphics
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.set_idle_timer_ms_4619827677550801152=80
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.support_kernel_idle_timer_4619827677550801152=true
diff --git a/thermal/thermal_info_config_charge_comet.json b/thermal/thermal_info_config_charge_comet.json
index 1fb655d..53d3b8e 100644
--- a/thermal/thermal_info_config_charge_comet.json
+++ b/thermal/thermal_info_config_charge_comet.json
@@ -107,7 +107,7 @@
"Combination": ["VIRTUAL-SKIN-CHARGE-OPEN", "VIRTUAL-SKIN-CHARGE-CLOSE"],
"Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
- "HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+ "HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0],
"HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier": 0.001,
"PollingDelay": 300000,
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index 6ce0082..50aaba7 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -142,7 +142,7 @@
"Combination": ["VIRTUAL-SKIN-OPEN", "VIRTUAL-SKIN-CLOSE"],
"Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
- "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 100.0, 140.0],
+ "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,
"PollingDelay": 300000,
@@ -168,7 +168,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
- "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0],
+ "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,
"SendPowerHint": true,
@@ -327,7 +327,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
- "HotThreshold": ["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
+ "HotThreshold": ["NAN", 41.0, 43.0, 53.0, "NAN", "NAN", "NAN"],
"HotHysteresis": [0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
@@ -430,7 +430,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
- "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0],
+ "HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,
"PollingDelay": 300000,
@@ -494,7 +494,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
- "HotThreshold": ["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"],
+ "HotThreshold": ["NAN", 43.0, 45.0, 46.5, 53.0, "NAN", "NAN"],
"HotHysteresis": [0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
@@ -526,7 +526,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
- "HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", 138.0, "NAN"],
+ "HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
"HotHysteresis": [0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
@@ -542,7 +542,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
- "HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+ "HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0],
"HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier": 0.001,
"PollingDelay": 300000,