Fix CarSystemBarControllerTest

Disable display compat toolbar when the left system bar is enable

Bug: 314819692
Bug: 314819772
Test: atest CarSystemBarControllerTest
Change-Id: I8100ea1ee9b8b2a86690509ccee281e6ab4ff979

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/src/com/android/systemui/car/systembar/CarSystemBarControllerTest.java b/tests/src/com/android/systemui/car/systembar/CarSystemBarControllerTest.java
index 561871ed..789a2ce8 100644
--- a/tests/src/com/android/systemui/car/systembar/CarSystemBarControllerTest.java
+++ b/tests/src/com/android/systemui/car/systembar/CarSystemBarControllerTest.java
@@ -257,6 +257,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testGetLeftWindow_leftDisabled_returnsNull() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, false);
         mCarSystemBar = createSystemBarController();
         ViewGroup window = mCarSystemBar.getLeftWindow();
@@ -265,6 +266,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testGetLeftWindow_leftEnabled_returnsWindow() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
         mCarSystemBar = createSystemBarController();
 
@@ -275,6 +277,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testGetLeftWindow_leftEnabled_calledTwice_returnsSameWindow() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
         mCarSystemBar = createSystemBarController();
 
@@ -361,6 +364,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testSetLeftWindowVisibility_setTrue_isVisible() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
         mCarSystemBar = createSystemBarController();
 
@@ -372,6 +376,7 @@ public class CarSystemBarControllerTest extends SysuiTestCase {
 
     @Test
     public void testSetLeftWindowVisibility_setFalse_isGone() {
+        mTestableResources.addOverride(R.integer.config_showDisplayCompatToolbarOnSystemBar, 0);
         mTestableResources.addOverride(R.bool.config_enableLeftSystemBar, true);
         mCarSystemBar = createSystemBarController();