Merge "Revert "No NavigationBar layer in tablets"" into sc-v2-dev (5214873a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -251,7 +251,8 @@ public class NavigationBarController implements Callbacks,

		/** @return {@code true} if taskbar is enabled, false otherwise */
		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
		removeNavigationBar(mContext.getDisplayId());
		mCommandQueue.addCallback(mTaskbarDelegate);
		@@ -260,7 +261,7 @@ public class NavigationBarController implements Callbacks,
		mCommandQueue.removeCallback(mTaskbarDelegate);
		mTaskbarDelegate.destroy();
		}
		return mIsTablet;
		return isShowingTaskbar;
		}

		@Override
		@@ -331,7 +332,7 @@ public class NavigationBarController implements Callbacks,
		return;
		}

		if (mIsTablet) {
		if (mIsTablet && mNavMode == NAV_BAR_MODE_3BUTTON) {
		return;
		}