commit 0130315860f014ef8343deacb984ec5cb90d56a3
author Brandon Dayauon <brdayauon@google.com> Thu Jun 23 21:45:12 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 23 21:45:12 2022 +0000
tree 47bd895bf3515b020e08f8101fb68c4969233452
parent 2df19a23455557912d6fe992e3c76e503122ccb3
parent 65590cb071d04b3d5384e9bb5bc10d9cd0d30fe2

Merge "Fix work toggle button that gets blocked by threeButton nav bar on TABLETS" into tm-qpr-dev

src/com/android/launcher3/allapps/WorkProfileManager.java

diff --git a/src/com/android/launcher3/allapps/WorkProfileManager.java b/src/com/android/launcher3/allapps/WorkProfileManager.java
index 8443923..5edd431 100644
--- a/src/com/android/launcher3/allapps/WorkProfileManager.java
+++ b/src/com/android/launcher3/allapps/WorkProfileManager.java
@@ -155,7 +155,12 @@
                     mWorkModeSwitch.getResources().getDimensionPixelSize(R.dimen.qsb_widget_height);
         }
         if (!mAllApps.mActivityContext.getDeviceProfile().isGestureMode){
-            workFabMarginBottom += mAllApps.mActivityContext.getDeviceProfile().getInsets().bottom;
+            if (mDeviceProfile.isTaskbarPresent){
+                workFabMarginBottom += mDeviceProfile.taskbarSize;
+            } else {
+                workFabMarginBottom +=
+                        mAllApps.mActivityContext.getDeviceProfile().getInsets().bottom;
+            }
         }
         lp.bottomMargin = workFabMarginBottom;
         int allAppsContainerWidth = mAllApps.getVisibleContainerView().getWidth();