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

Merge "Revert "Revert "No NavigationBar layer in tablets""" into sc-v2-dev am: 3d9545ef4e am: ff74bd5bcc

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

Change-Id: I3a951464d65d29f3e3073eb8f1a8f081a5f1c563
This commit is contained in:
Tracy Zhou
2021-08-17 01:31:47 +00:00
committed by Automerger Merge Worker
parent a3655d85d1 ff74bd5bcc
commit 19b12a0495
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,8 +251,7 @@ public class NavigationBarController implements Callbacks,
/** @return {@code true} if taskbar is enabled, false otherwise */
private boolean initializeTaskbarIfNecessary() {
boolean isShowingTaskbar = mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON;
if (isShowingTaskbar) {
if (mIsTablet) {
// Remove navigation bar when taskbar is showing, currently only for 3 button mode
removeNavigationBar(mContext.getDisplayId());
mCommandQueue.addCallback(mTaskbarDelegate);
@@ -261,7 +260,7 @@ public class NavigationBarController implements Callbacks,
mCommandQueue.removeCallback(mTaskbarDelegate);
mTaskbarDelegate.destroy();
}
return isShowingTaskbar;
return mIsTablet;
}
@Override
@@ -332,7 +331,7 @@ public class NavigationBarController implements Callbacks,
return;
}
if (mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON) {
if (mIsTablet) {
return;
}