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

Merge "Revert "No NavigationBar layer in tablets"" into sc-v2-dev am: 5214873aa8

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

Change-Id: I6ac88f9f81b2b1e1e29ebff81f4449898e8fefda
This commit is contained in:
Alex Chau
2021-08-11 10:18:22 +00:00
committed by Automerger Merge Worker
parent 5c202c7f85 5214873aa8
commit 0c4ee656d4
1 changed files with 4 additions and 3 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,7 +251,8 @@ public class NavigationBarController implements Callbacks,
/** @return {@code true} if taskbar is enabled, false otherwise */ /** @return {@code true} if taskbar is enabled, false otherwise */
private boolean initializeTaskbarIfNecessary() { private boolean initializeTaskbarIfNecessary() {
if (mIsTablet) { boolean isShowingTaskbar = mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON;
if (isShowingTaskbar) {
// Remove navigation bar when taskbar is showing, currently only for 3 button mode // Remove navigation bar when taskbar is showing, currently only for 3 button mode
removeNavigationBar(mContext.getDisplayId()); removeNavigationBar(mContext.getDisplayId());
mCommandQueue.addCallback(mTaskbarDelegate); mCommandQueue.addCallback(mTaskbarDelegate);
@@ -260,7 +261,7 @@ public class NavigationBarController implements Callbacks,
mCommandQueue.removeCallback(mTaskbarDelegate); mCommandQueue.removeCallback(mTaskbarDelegate);
mTaskbarDelegate.destroy(); mTaskbarDelegate.destroy();
} }
return mIsTablet; return isShowingTaskbar;
} }
@Override @Override
@@ -331,7 +332,7 @@ public class NavigationBarController implements Callbacks,
return; return;
} }
if (mIsTablet) { if (mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON) {
return; return;
} }