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

Commit 2a9859b5 authored by Romain Guy's avatar Romain Guy Committed by android-build-team Robot
Browse files

Add color mode setting 

The new setting appears on devices that support color management
and wide color gamut rendering. The setting allows the user to
choose between natural (sRGB), boosted (sRGB + 10% saturation)
and saturated (unmanaged colors; colors are remapped to the device's
native gamut).

This change adds a metric constant for analytics in Settings
and uses a persistent system property to know when to suppress
color management.

Bug: 68159303
Test: manual
Change-Id: I83cc972fc3a2290ff106eae0e76a3ee799503813
(cherry picked from commit 62e8c175)
parent 3fa31378

proto/src/metrics_constants.proto

+5 −0
Original line number Original line Diff line number Diff line
@@ -4562,6 +4562,11 @@ message MetricsEvent { 
    // OS: O MR

    // OS: O MR

    NOTIFICATION_SNOOZE_OPTIONS = 1142;

    NOTIFICATION_SNOOZE_OPTIONS = 1142;





    // OPEN: Settings > Display > Colors

    // CATEGORY: SETTINGS

    // OS: O MR

    COLOR_MODE_SETTINGS = 1143;



    // ---- End O-MR1 Constants, all O-MR1 constants go above this line ----

    // ---- End O-MR1 Constants, all O-MR1 constants go above this line ----





    // Add new aosp constants above this line.

    // Add new aosp constants above this line.

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -7673,7 +7673,8 @@ public class WindowManagerService extends IWindowManager.Stub 
    }

    }





    boolean hasWideColorGamutSupport() {

    boolean hasWideColorGamutSupport() {

        return mHasWideColorGamutSupport;

        return mHasWideColorGamutSupport &&

                !SystemProperties.getBoolean("persist.sys.sf.native_mode", false);

    }

    }





    void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {

    void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {