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

Commit bfc1cee8 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477,... 

Merge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477, 3156098, 3156099, 3156100, 3156101, 3156102, 3158393, 3155699, 3155700, 3156195, 3156196, 3156019, 3156020, 3158394] into oc-mr1-release

Change-Id: I21ded79f3ace42dc5daff630682023cbb0792a18
parents 4f6263a5 d53173e6

src/com/android/settings/development/DevelopmentSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
        mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);

        mColorModePreference.updateCurrentAndSupported();

        if (mColorModePreference.getColorModeCount() < 2 ||

                getContext().getDisplay().isWideColorGamut()) {

                getContext().getResources().getConfiguration().isScreenWideColorGamut()) {

            removePreference(KEY_COLOR_MODE);

            mColorModePreference = null;

        }