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

Commit 14f8fd20 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Only enable wide color gamut support on capable devices" into... 

Merge "Merge "Only enable wide color gamut support on capable devices" into oc-dr1-dev am: 8d4ff1b3 am: b11cf2d2"
parents fd4b85ad f979298b

core/java/android/content/res/Configuration.java

+12 −13
Original line number Diff line number Diff line
@@ -16,29 +16,26 @@ 


package android.content.res;



import android.graphics.Point;

import android.graphics.Rect;

import android.util.DisplayMetrics;

import android.view.Display;

import android.view.DisplayInfo;

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.pm.ActivityInfo;

import android.content.pm.ActivityInfo.Config;

import android.graphics.Rect;

import android.os.Build;

import android.os.LocaleList;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;

import android.view.DisplayInfo;

import android.view.View;



import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;



import java.io.IOException;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -1818,9 +1815,11 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
    }



    /**

     * Return whether the screen has a wide color gamut.

     * Return whether the screen has a wide color gamut and wide color gamut rendering

     * is supported by this device.

     *

     * @return true if the screen has a wide color gamut, false otherwise

     * @return true if the screen has a wide color gamut and wide color gamut rendering

     * is supported, false otherwise

     */

    public boolean isScreenWideColorGamut() {

        return (colorMode & COLOR_MODE_WIDE_COLOR_GAMUT_MASK) == COLOR_MODE_WIDE_COLOR_GAMUT_YES;

core/java/android/view/Display.java

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE; 
import android.annotation.IntDef;

import android.annotation.RequiresPermission;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.PixelFormat;

import android.graphics.Point;
@@ -854,6 +855,9 @@ public final class Display { 


    /**

     * Returns whether this display can be used to display wide color gamut content.

     * This does not necessarily mean the device itself can render wide color gamut

     * content. To ensure wide color gamut content can be produced, refer to

     * {@link Configuration#isScreenWideColorGamut()}.

     */

    public boolean isWideColorGamut() {

        synchronized (this) {

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -963,7 +963,8 @@ public final class ViewRootImpl implements ViewParent, 
                        || insets.top != 0 || insets.bottom != 0;

                final boolean translucent = attrs.format != PixelFormat.OPAQUE || hasSurfaceInsets;

                final boolean wideGamut =

                        attrs.getColorMode() == ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT;

                        mContext.getResources().getConfiguration().isScreenWideColorGamut()

                        && attrs.getColorMode() == ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT;



                mAttachInfo.mThreadedRenderer = ThreadedRenderer.create(mContext, translucent,

                        attrs.getTitle().toString());

services/core/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android.hardware.oemlock-V1.0-java-static \

    android.hardware.tetheroffload.control-V1.0-java-static \

    android.hardware.vibrator-V1.0-java-constants \

    android.hardware.configstore-V1.0-java-static



ifneq ($(INCREMENTAL_BUILDS),)

    LOCAL_PROGUARD_ENABLED := disabled

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

+1 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                (displayInfo.isHdr()

                        ? Configuration.COLOR_MODE_HDR_YES

                        : Configuration.COLOR_MODE_HDR_NO)

                        | (displayInfo.isWideColorGamut()

                        | (displayInfo.isWideColorGamut() && mService.hasWideColorGamutSupport()

                        ? Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES

                        : Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_NO);