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

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

Merge cherrypicks of [3122088, 3121430, 3119129, 3119130, 3119131, 3120667] into oc-mr1-release 

Change-Id: I27e7d8f0f1dc1d73083eb6949e0c40d1ed77445c
parents 3fa31378 2a9859b5

proto/src/metrics_constants.proto

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

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



    // Add new aosp constants above this line.

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

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



    boolean hasWideColorGamutSupport() {

        return mHasWideColorGamutSupport;

        return mHasWideColorGamutSupport &&

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

    }



    void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {