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

Commit 6cd61063 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents ccef8d44 64a82df6

res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -189,4 +189,7 @@ 


    <!-- Configure notifications: Title for advanced notification settings pane -->

    <string name="advanced_notifications_title">Advanced notification settings</string>



    <!-- Display settings screen, peak refresh rate settings summary [CHAR LIMIT=NONE] -->

    <string name="peak_refresh_rate_summary_custom">Automatically raises the refresh rate from 60 to %1$d Hz for some content. Increases battery usage.</string>

</resources>

res/xml/display_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 
    <SwitchPreference

        android:key="peak_refresh_rate"

        android:title="@string/peak_refresh_rate_title"

        android:summary="@string/peak_refresh_rate_summary"

        settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController" />



    <Preference

src/com/android/settings/display/PeakRefreshRatePreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ public class PeakRefreshRatePreferenceController extends TogglePreferenceControl 
        super.displayPreference(screen);



        mPreference = screen.findPreference(getPreferenceKey());



        final String summary = mContext.getString(R.string.peak_refresh_rate_summary_custom,

                (int)mPeakRefreshRate);

        mPreference.setSummary(summary);

    }



    @Override