Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix test when running on large screen devices" into sc-v2-dev am: 9ff10b86c9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15472904

Change-Id: I7f40327a507d1dc1c9818077f717296f1e568e5c
This commit is contained in:
Alex Florescu
2021-08-06 10:35:41 +00:00
committed by Automerger Merge Worker
parent 66baecb03a 9ff10b86c9
commit 27cd93e623
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
View File

@@ -116,7 +116,7 @@ public class NavigationBarController implements Callbacks,
private final TaskbarDelegate mTaskbarDelegate; private final TaskbarDelegate mTaskbarDelegate;
private final NotificationShadeDepthController mNotificationShadeDepthController; private final NotificationShadeDepthController mNotificationShadeDepthController;
private int mNavMode; private int mNavMode;
private boolean mIsTablet; @VisibleForTesting boolean mIsTablet;
private final UserTracker mUserTracker; private final UserTracker mUserTracker;
/** A displayId - nav bar maps. */ /** A displayId - nav bar maps. */

2
packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java
View File

@@ -142,6 +142,8 @@ public class NavigationBarControllerTest extends SysuiTestCase {
@Test @Test
public void testCreateNavigationBarsIncludeDefaultTrue() { public void testCreateNavigationBarsIncludeDefaultTrue() {
// Tablets may be using taskbar and the logic is different
mNavigationBarController.mIsTablet = false;
doNothing().when(mNavigationBarController).createNavigationBar(any(), any(), any()); doNothing().when(mNavigationBarController).createNavigationBar(any(), any(), any());
mNavigationBarController.createNavigationBars(true, null); mNavigationBarController.createNavigationBars(true, null);