Merge "Enable 3 button nav for taskbar" into sc-v2-dev am: ae7c8cacd5

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

Change-Id: Id5b929c6c9bd0dfa066e63ee6fc5636d3dc50512

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

@@ -105,7 +105,7 @@ public class NavbarButtonsViewController {
             return true;
         };
 
-        if (mContext.canShowNavButtons()) {
+        if (mContext.isThreeButtonNav()) {
             initButtons(mStartContainer, mEndContainer, mControllers.navButtonController);
 
             // Animate taskbar background when IME shows

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

@@ -161,8 +161,8 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
         mWindowManager.addView(mDragLayer, mWindowLayoutParams);
     }
 
-    public boolean canShowNavButtons() {
+    public boolean isThreeButtonNav() {
-        return ENABLE_THREE_BUTTON_TASKBAR && mNavMode == Mode.THREE_BUTTONS;
+        return mNavMode == Mode.THREE_BUTTONS;
     }
 
     @Override
@@ -215,7 +215,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ
     }
 
     public void updateSysuiStateFlags(int systemUiStateFlags, boolean forceUpdate) {
-        if (!canShowNavButtons()) {
+        if (!isThreeButtonNav()) {
             return;
         }
         mControllers.navbarButtonsViewController.updateStateForSysuiFlags(

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

@@ -61,7 +61,7 @@ public class TaskbarControllers {
      */
     public void init() {
         navbarButtonsViewController.init(this);
-        if (taskbarActivityContext.canShowNavButtons()) {
+        if (taskbarActivityContext.isThreeButtonNav()) {
             rotationButtonController.init();
         }
         taskbarDragLayerController.init(this);

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

@@ -93,7 +93,7 @@ public class TaskbarDragLayerController {
          */
         public void updateInsetsTouchability(InsetsInfo insetsInfo) {
             insetsInfo.touchableRegion.setEmpty();
-            if (mActivity.canShowNavButtons()) {
+            if (mActivity.isThreeButtonNav()) {
                 // Always have nav buttons be touchable
                 mControllers.navbarButtonsViewController.addVisibleButtonsRegion(
                         mTaskbarDragLayer, insetsInfo.touchableRegion);

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

@@ -57,7 +57,7 @@ public class TaskbarKeyguardController {
         mKeyguardSysuiFlags = interestingKeyguardFlags;
 
         mBouncerShowing = bouncerShowing;
-        if (!mContext.canShowNavButtons()) {
+        if (!mContext.isThreeButtonNav()) {
             // For gesture nav we don't need to deal with bouncer or showing taskbar when locked
             return;
         }