Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fc7a3c0 authored by Sahil Sonar's avatar Sahil Sonar 💬
Browse files

Merge branch '1353-t-FP5_default_60hz' into 'v3.0-t' 

Revert "FP5: Use content detection for refresh rate"

See merge request !36
parents 7cc4dbdc 7fb333a3

device.mk

+3 −0
Original line number Diff line number Diff line
@@ -322,11 +322,14 @@ PRODUCT_PACKAGES += \ 
    libstagefrighthw



# Overlay

DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage



PRODUCT_PACKAGES += \

    CarrierConfigResCommon \

    eCameraTarget \

    FrameworksResCommon \

    FrameworksResTarget \

    SettingsProviderRes \

    SettingsResCommon \

    SystemUIResCommon \

    SystemUIResTarget \

overlay-lineage/packages/apps/Settings/res/values/config.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?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>

overlay/FrameworksResCommon/res/values/config.xml

+5 −19
Original line number Diff line number Diff line
@@ -94,25 +94,11 @@ 
         the restoring is handled by modem if it is true -->

    <bool name="skip_restoring_network_selection">true</bool>



    <!-- 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>

    <!-- 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>



    <!--  Maximum number of supported users -->

    <integer name="config_multiuserMaximumUsers">4</integer>

overlay/SettingsProviderRes/Android.bp

0 → 100644
+8 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2022 The LineageOS Project

// SPDX-License-Identifier: Apache-2.0

//

runtime_resource_overlay {

    name: "SettingsProviderRes",

    product_specific: true,

}

overlay/SettingsProviderRes/AndroidManifest.xml

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<?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.providers.settings.overlay">



    <overlay

        android:isStatic="true"

        android:priority="800"

        android:targetPackage="com.android.providers.settings" />

</manifest>