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

Commit 8b3152c3 authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "Add color mode setting" into oc-mr1-dev am: 19aa8ae9 

am: 51c2848c

Change-Id: I97fb37429e97c59b223a36431f59c43c86c92ab0
parents 998d84a0 51c2848c

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





    // OPEN: Settings > Network & Internet > Mobile network

    // OPEN: Settings > Network & Internet > Mobile network

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -7702,7 +7702,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) {