Snap for 7360053 from d8eb2aca0b15fc5b5f3406a3c82d62a8f5d03143 to sc-v2-release (66daf83e) · Commits · e / os / android_packages_apps_DocumentsUI

tests/functional/com/android/documentsui/ui/DarkThemeUiTest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public class DarkThemeUiTest extends ThemeUiTestBase {
		}

		@Test
		public void themeNightModeEnable_actionBarColorShouldBeDark() {
		public void themeNightModeEnable_actionBarColorShouldBeDark() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorBackground,
		mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
		@@ -75,7 +75,7 @@ public class DarkThemeUiTest extends ThemeUiTestBase {
		}

		@Test
		public void themeNightModeEnable_windowBackgroundColorShouldBeDark() {
		public void themeNightModeEnable_windowBackgroundColorShouldBeDark() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_windowBackground,
		mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
		@@ -83,7 +83,7 @@ public class DarkThemeUiTest extends ThemeUiTestBase {
		}

		@Test
		public void themeNightModeEnable_statusBarColorShouldBeDark() {
		public void themeNightModeEnable_statusBarColorShouldBeDark() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_statusBarColor,
		mTheme.getResources().getColor(com.android.documentsui.R.color.app_background_color,
		@@ -91,7 +91,7 @@ public class DarkThemeUiTest extends ThemeUiTestBase {
		}

		@Test
		public void appCompatThemeNightModeEnable_colorPrimaryShouldBeThemeable() {
		public void appCompatThemeNightModeEnable_colorPrimaryShouldBeThemeable() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorPrimary,
		mTheme.getResources().getColor(com.android.documentsui.R.color.primary, mTheme));

tests/functional/com/android/documentsui/ui/ThemeUiTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public class ThemeUiTest extends ThemeUiTestBase {
		}

		@Test
		public void themeNightModeDisable_actionBarColorShouldBeLight() {
		public void themeNightModeDisable_actionBarColorShouldBeLight() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorBackground,
		Color.WHITE);
		@@ -65,28 +65,28 @@ public class ThemeUiTest extends ThemeUiTestBase {
		}

		@Test
		public void themeNightModeDisable_navigationBarColorShouldBeLight() {
		public void themeNightModeDisable_navigationBarColorShouldBeLight() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_navigationBarColor,
		Color.WHITE);
		}

		@Test
		public void themeNightModeDisable_windowBackgroundColorShouldBeLight() {
		public void themeNightModeDisable_windowBackgroundColorShouldBeLight() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_windowBackground,
		Color.WHITE);
		}

		@Test
		public void themeNightModeDisable_statusBarColorShouldBeLight() {
		public void themeNightModeDisable_statusBarColorShouldBeLight() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_statusBarColor,
		Color.WHITE);
		}

		@Test
		public void appCompatThemeNightModeDisable_colorPrimaryShouldBeThemeable() {
		public void appCompatThemeNightModeDisable_colorPrimaryShouldBeThemeable() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.ThemeColor, R.styleable.ThemeColor_android_colorPrimary,
		mTheme.getResources().getColor(com.android.documentsui.R.color.primary, mTheme));