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

Commit f0a15601 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents 045523da 827b1566

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

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.settings.R; 
import com.android.settings.core.BasePreferenceController;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Locale;
@@ -49,6 +50,8 @@ public class MinRefreshRatePreferenceController extends BasePreferenceController 
        if (mContext.getResources().getBoolean(R.bool.config_show_min_refresh_rate_switch)) {

            Display.Mode mode = mContext.getDisplay().getMode();

            Display.Mode[] modes = mContext.getDisplay().getSupportedModes();

            Arrays.sort(modes, (mode1, mode2) ->

                Float.compare(mode2.getRefreshRate(), mode1.getRefreshRate()));

            for (Display.Mode m : modes) {

                if (m.getPhysicalWidth() == mode.getPhysicalWidth() &&

                        m.getPhysicalHeight() == mode.getPhysicalHeight()) {

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

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.settingslib.core.lifecycle.events.OnStart; 
import com.android.settingslib.core.lifecycle.events.OnStop;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.concurrent.Executor;

import java.util.List;

import java.util.Locale;
@@ -79,6 +80,8 @@ public class PeakRefreshRateListPreferenceController extends BasePreferenceContr 
        } else {

            Display.Mode mode = display.getMode();

            Display.Mode[] modes = display.getSupportedModes();

            Arrays.sort(modes, (mode1, mode2) ->

                Float.compare(mode2.getRefreshRate(), mode1.getRefreshRate()));

            for (Display.Mode m : modes) {

                if (m.getPhysicalWidth() == mode.getPhysicalWidth() &&

                        m.getPhysicalHeight() == mode.getPhysicalHeight()) {