Use Window.isWideColorGamut()
Bug: 62832666
Test: CtsColorModeTestCases, CtsViewTestCases
Change-Id: I406cf978a11b687056a4d4c726dc1b03b086100c
diff --git a/tests/tests/colormode/src/android/colormode/cts/DefaultColorModeTest.java b/tests/tests/colormode/src/android/colormode/cts/DefaultColorModeTest.java
index 06273eb..4d076f8 100644
--- a/tests/tests/colormode/src/android/colormode/cts/DefaultColorModeTest.java
+++ b/tests/tests/colormode/src/android/colormode/cts/DefaultColorModeTest.java
@@ -30,6 +30,7 @@
import org.junit.runner.RunWith;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
@MediumTest
@RunWith(AndroidJUnit4.class)
@@ -53,5 +54,7 @@
Window window = mActivity.getWindow();
assertEquals(ActivityInfo.COLOR_MODE_DEFAULT, window.getAttributes().getColorMode());
+
+ assertFalse(window.isWideColorGamut());
}
}
diff --git a/tests/tests/view/src/android/view/cts/PixelCopyTest.java b/tests/tests/view/src/android/view/cts/PixelCopyTest.java
index d94fe6f..e0910c0 100644
--- a/tests/tests/view/src/android/view/cts/PixelCopyTest.java
+++ b/tests/tests/view/src/android/view/cts/PixelCopyTest.java
@@ -370,7 +370,7 @@
ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT, window.getAttributes().getColorMode());
// Early out if the device does not support wide color gamut rendering
- if (!window.getDecorView().getDisplay().isWideColorGamut()) {
+ if (!window.isWideColorGamut()) {
return;
}
@@ -400,7 +400,7 @@
ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT, window.getAttributes().getColorMode());
// Early out if the device does not support wide color gamut rendering
- if (!window.getDecorView().getDisplay().isWideColorGamut()) {
+ if (!window.isWideColorGamut()) {
return;
}
