commit e98ef15f9bf3269720cca8776afb1bac2fd859f2
author Vinit Nayak <peanutbutter@google.com> Fri Jun 04 02:09:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 04 02:09:44 2021 +0000
tree 00376650a68c7e9818421376779b636e1727f369
parent dd69465831adbbf64cd37c6efc50ca0eaeb24ef6
parent 759490be1d51e3f2322b21113360cd28ca5d9409

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

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

Change-Id: I2ee6ce03bb0a9cd96d47605cb0193c8780c4d5c8

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