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

Merge "Fix multi-display nav bar tests on large screen devices" into tm-qpr-dev

Browse Source
This commit is contained in:
Charles Chen
2022-08-08 19:47:42 +00:00
committed by Android (Google) Code Review
parent eb706b6e1b 1e164d4a87
commit cfaad7ffb3
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,10 +302,6 @@ public class NavigationBarController implements
*/ */
@VisibleForTesting @VisibleForTesting
void createNavigationBar(Display display, Bundle savedState, RegisterStatusBarResult result) { void createNavigationBar(Display display, Bundle savedState, RegisterStatusBarResult result) {
if (initializeTaskbarIfNecessary()) {
return;
}
if (display == null) { if (display == null) {
return; return;
} }
@@ -315,7 +311,7 @@ public class NavigationBarController implements
// We may show TaskBar on the default display for large screen device. Don't need to create // We may show TaskBar on the default display for large screen device. Don't need to create
// navigation bar for this case. // navigation bar for this case.
if (mIsTablet && isOnDefaultDisplay) { if (isOnDefaultDisplay && initializeTaskbarIfNecessary()) {
return; return;
} }