Merge "Check for taskbar 3 button flag when initializing RotationContextualButton" into sc-v2-dev
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
index 5d4b8b7..549e26c 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java
@@ -73,7 +73,7 @@
mTaskbarView.getLayoutParams().height = mActivity.getDeviceProfile().taskbarSize;
mDragLayer.init(new TaskbarDragLayerCallbacks(), mTaskbarView);
- if (navMode == SysUINavigationMode.Mode.THREE_BUTTONS) {
+ if (mActivity.canShowNavButtons()) {
mRotationButtonController.setRotationButton(mTaskbarView.getContextualRotationButton());
}
}