commit 26b0f313e4e66e84233ced558aebfcf2456e2885
author Vinit Nayak <peanutbutter@google.com> Fri Jun 04 02:57:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 04 02:57:03 2021 +0000
tree bfbe1f46aa9a6016d2a9ba76f1e2dcd6761c33d1
parent 37898cf296b0cc2bb804ff945b22320f66962a81
parent e98ef15f9bf3269720cca8776afb1bac2fd859f2

Merge "Check for taskbar 3 button flag when initializing RotationContextualButton" into sc-v2-dev am: 759490be1d am: e98ef15f9b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14826862

Change-Id: Ida69d5187715603b75eae06fb758ba92fecda614

quickstep/src/com/android/launcher3/taskbar/TaskbarIconController.java

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());
         }
     }