From c83e1717350b2df06d4cf5af3fca970201073c96 Mon Sep 17 00:00:00 2001
From: SahilSonar <sss.sonar2003@gmail.com>
Date: Sun, 26 Nov 2023 20:20:25 +0530
Subject: [PATCH 1/2] FP5: Use content detection for refresh rate

  - No artifact noticed on boot animation with 90Hz refresh rate.
    This reverts commit 585150e90cfb66f4845d2b29f3348d94f8e1aeef.
    This reverts commit 03ccb9158317960626757813582ea716dab3819a.
    This reverts commit fe45821c73fb8a427d684b244ca5aab7b3316509.
    This reverts commit 1dc193d74a2652acbb1758770f991d8db3e0ef26.
---
 device.mk                                     |  2 --
 .../apps/Settings/res/values/config.xml       | 22 -----------------
 .../FrameworksResCommon/res/values/config.xml | 24 +++++++++++++++----
 vendor.prop                                   |  1 +
 4 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 overlay-lineage/packages/apps/Settings/res/values/config.xml

diff --git a/device.mk b/device.mk
index 570144c..6f09f7a 100644
--- a/device.mk
+++ b/device.mk
@@ -320,8 +320,6 @@ PRODUCT_PACKAGES += \
     libstagefrighthw
 
 # Overlay
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
-
 PRODUCT_PACKAGES += \
     CarrierConfigResCommon \
     eCameraTarget \
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/overlay-lineage/packages/apps/Settings/res/values/config.xml
deleted file mode 100644
index 7050a98..0000000
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2021, 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">
-    <!-- Whether to show min refresh rate in display settings -->
-    <bool name="config_show_min_refresh_rate_switch">true</bool>
-</resources>
diff --git a/overlay/FrameworksResCommon/res/values/config.xml b/overlay/FrameworksResCommon/res/values/config.xml
index 3e117ff..d37afc8 100644
--- a/overlay/FrameworksResCommon/res/values/config.xml
+++ b/overlay/FrameworksResCommon/res/values/config.xml
@@ -94,11 +94,25 @@
          the restoring is handled by modem if it is true -->
     <bool name="skip_restoring_network_selection">true</bool>
 
-    <!-- The default peak refresh rate for a given device. Change this value if you want to prevent
-         the framework from using higher refresh rates, even if display modes with higher refresh
-         rates are available from hardware composer. Only has an effect if the value is
-         non-zero. -->
-    <integer name="config_defaultPeakRefreshRate">60</integer>
+    <!-- The default refresh rate for a given device. Change this value to set a higher default
+         refresh rate. If the hardware composer on the device supports display modes with a higher
+         refresh rate than the default value specified here, the framework may use those higher
+         refresh rate modes if an app chooses one by setting preferredDisplayModeId or calling
+         setFrameRate().
+         If a non-zero value is set for config_defaultPeakRefreshRate, then
+         config_defaultRefreshRate may be set to 0, in which case the value set for
+         config_defaultPeakRefreshRate will act as the default frame rate. -->
+    <integer name="config_defaultPeakRefreshRate">240</integer>
+
+    <!-- The default refresh rate for a given device. Change this value to set a higher default
+         refresh rate. If the hardware composer on the device supports display modes with a higher
+         refresh rate than the default value specified here, the framework may use those higher
+         refresh rate modes if an app chooses one by setting preferredDisplayModeId or calling
+         setFrameRate().
+         If a non-zero value is set for config_defaultPeakRefreshRate, then
+         config_defaultRefreshRate may be set to 0, in which case the value set for
+         config_defaultPeakRefreshRate will act as the default frame rate. -->
+    <integer name="config_defaultRefreshRate">0</integer>
 
     <!--  Maximum number of supported users -->
     <integer name="config_multiuserMaximumUsers">4</integer>
diff --git a/vendor.prop b/vendor.prop
index 8469cd7..1ebd817 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -134,6 +134,7 @@ ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 ro.surface_flinger.max_virtual_display_dimension=4096
 ro.surface_flinger.protected_contents=true
 ro.surface_flinger.use_color_management=true
+ro.surface_flinger.use_content_detection_for_refresh_rate=true
 ro.surface_flinger.wcg_composition_dataspace=143261696
 
 # Incremental FS
-- 
GitLab


From 60b69c3c60a01722c9db787015155c529b959aef Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sun, 26 Nov 2023 20:26:31 +0530
Subject: [PATCH 2/2] FP5: overlay: Enable Smooth Display setting

FP5 has peak refresh rate higher than
60 Hz, so allow users to toggle high-refresh rate like on stock.

Change-Id: I7fcbb905b61575de8c5e9d9a935463932551fb6a
---
 device.mk                                       |  1 +
 overlay/SettingsResCommon/Android.bp            |  9 +++++++++
 overlay/SettingsResCommon/AndroidManifest.xml   | 13 +++++++++++++
 overlay/SettingsResCommon/res/values/config.xml |  4 ++++
 4 files changed, 27 insertions(+)
 create mode 100644 overlay/SettingsResCommon/Android.bp
 create mode 100644 overlay/SettingsResCommon/AndroidManifest.xml
 create mode 100644 overlay/SettingsResCommon/res/values/config.xml

diff --git a/device.mk b/device.mk
index 6f09f7a..17ad769 100644
--- a/device.mk
+++ b/device.mk
@@ -325,6 +325,7 @@ PRODUCT_PACKAGES += \
     eCameraTarget \
     FrameworksResCommon \
     FrameworksResTarget \
+    SettingsResCommon \
     SystemUIResCommon \
     SystemUIResTarget \
     TelephonyResCommon \
diff --git a/overlay/SettingsResCommon/Android.bp b/overlay/SettingsResCommon/Android.bp
new file mode 100644
index 0000000..e007bd6
--- /dev/null
+++ b/overlay/SettingsResCommon/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsResCommon",
+    vendor: true,
+}
diff --git a/overlay/SettingsResCommon/AndroidManifest.xml b/overlay/SettingsResCommon/AndroidManifest.xml
new file mode 100644
index 0000000..c36f685
--- /dev/null
+++ b/overlay/SettingsResCommon/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.common">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="800"
+        android:targetPackage="com.android.settings" />
+</manifest>
diff --git a/overlay/SettingsResCommon/res/values/config.xml b/overlay/SettingsResCommon/res/values/config.xml
new file mode 100644
index 0000000..bc7b11a
--- /dev/null
+++ b/overlay/SettingsResCommon/res/values/config.xml
@@ -0,0 +1,4 @@
+<resources>
+    <!-- Whether to show Smooth Display feature in Settings Options -->
+    <bool name="config_show_smooth_display">true</bool>
+</resources>
-- 
GitLab