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

Commit 408afbf0 authored by Romain Guy's avatar Romain Guy
Browse files

Change configuration's color mode based on the display's color mode 

Bug: 32984164
Test: CtsContentTestCases

Change-Id: Iedc7d1cc488b80718576082667b6e96956c4f847
parent 6ab568b4

core/java/android/content/pm/PackageParser.java

+2 −2
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ public class PackageParser { 
        XmlResourceParser parser = null;

        try {

            res = new Resources(assets, mMetrics, null);

            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

                    Build.VERSION.RESOURCES_SDK_INT);

            parser = assets.openXmlResourceParser(cookie, ANDROID_MANIFEST_FILENAME);
@@ -1568,7 +1568,7 @@ public class PackageParser { 


    private static AssetManager newConfiguredAssetManager() {

        AssetManager assetManager = new AssetManager();

        assetManager.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

        assetManager.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

                Build.VERSION.RESOURCES_SDK_INT);

        return assetManager;

    }

core/java/android/content/pm/split/DefaultSplitAssetLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class DefaultSplitAssetLoader implements SplitAssetLoader { 


        AssetManager assets = new AssetManager();

        try {

            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

                    Build.VERSION.RESOURCES_SDK_INT);

            loadApkIntoAssetManager(assets, mBaseCodePath, mFlags);

core/java/android/content/pm/split/SplitAssetDependencyLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class SplitAssetDependencyLoader 
            throws PackageParser.PackageParserException {

        final AssetManager assets = new AssetManager();

        try {

            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

                    Build.VERSION.RESOURCES_SDK_INT);



            for (String assetPath : assetPaths) {

core/java/android/content/res/AssetManager.java

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ public final class AssetManager implements AutoCloseable { 
            int orientation, int touchscreen, int density, int keyboard,

            int keyboardHidden, int navigation, int screenWidth, int screenHeight,

            int smallestScreenWidthDp, int screenWidthDp, int screenHeightDp,

            int screenLayout, int uiMode, int majorVersion);

            int screenLayout, int uiMode, int colorMode, int majorVersion);



    /**

     * Retrieve the resource identifier for the given resource name.

core/java/android/content/res/ResourcesImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ public class ResourcesImpl { 
                        mConfiguration.smallestScreenWidthDp,

                        mConfiguration.screenWidthDp, mConfiguration.screenHeightDp,

                        mConfiguration.screenLayout, mConfiguration.uiMode,

                        Build.VERSION.RESOURCES_SDK_INT);

                        mConfiguration.colorMode, Build.VERSION.RESOURCES_SDK_INT);



                if (DEBUG_CONFIG) {

                    Slog.i(TAG, "**** Updating config of " + this + ": final config is "