Merge "Disable a few final presubmits failing with Flexiglass enabled" into main (2e98543d) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,7 @@ import dagger.Lazy;
		import kotlinx.coroutines.test.TestScope;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		@@ -701,6 +702,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
		}

		@Test
		@Ignore("b/427066068")
		public void lockscreenStateMetrics_notShowing_secure() {
		// uninteresting state, except that fingerprint must be non-zero
		when(mKeyguardStateController.isOccluded()).thenReturn(false);
		@@ -983,6 +985,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
		}

		@Test
		@Ignore("b/427066068")
		public void testShowKeyguardImplementation_setsState() {
		when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>());

		@@ -1133,6 +1136,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
		}

		@Test
		@Ignore("b/416718983")
		public void testKeyguardHideDelayedIfOcclusionAnimationRunning() {
		// Show the keyguard and verify we've done so.
		setKeyguardShowingAndOccluded(true /* showing /, false / occluded */);
		@@ -1152,6 +1156,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
		}

		@Test
		@Ignore("b/416718983")
		public void testKeyguardHideNotDelayedIfOcclusionAnimationNotRunning() {
		// Show the keyguard and verify we've done so.
		setKeyguardShowingAndOccluded(true /* showing /, false / occluded */);
		@@ -1242,6 +1247,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase {

		@Test
		@DisableFlags(FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE)
		@Ignore("b/427066068")
		public void dismissKeyboardShortcuts_largeScreen_newFlagsDisabled_dismissesTabletVersion() {
		switchToLargeScreen();
		mFeatureFlags.set(SHORTCUT_LIST_SEARCH_LAYOUT, true);
		@@ -1292,6 +1298,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase {

		@Test
		@DisableFlags(FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE)
		@Ignore("b/427066068")
		public void dismissKeyboardShortcuts_smallScreen_bothFlagsDisabled_dismissesPhoneVersion() {
		switchToSmallScreen();
		mFeatureFlags.set(SHORTCUT_LIST_SEARCH_LAYOUT, false);
		@@ -1305,6 +1312,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase {

		@Test
		@EnableFlags(FLAG_KEYBOARD_SHORTCUT_HELPER_REWRITE)
		@Ignore("b/427066068")
		public void toggleKeyboardShortcuts_largeScreen_bothFlagsEnabled_doesNotTogglesAny() {
		switchToLargeScreen();
		mFeatureFlags.set(SHORTCUT_LIST_SEARCH_LAYOUT, true);