Merge "Fixed overlap issue where toggle button gets overlapped by 3 button nav bar..now button shifts up so it's not totally obscured" into tm-dev am: 32f1e89193

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

Change-Id: I9b82d284f3f5cc3844c43b941c8204e06faac077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brandon Dayauon
2022-04-16 19:54:09 +00:00
committed by Automerger Merge Worker

View File

@@ -27,6 +27,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import android.view.ViewGroup;
import android.view.WindowInsets;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
@@ -147,6 +148,9 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP
workFabMarginBottom +=
mWorkModeSwitch.getResources().getDimensionPixelSize(R.dimen.qsb_widget_height);
}
if (!mAllApps.mActivityContext.getDeviceProfile().isGestureMode){
workFabMarginBottom += mAllApps.mActivityContext.getDeviceProfile().getInsets().bottom;
}
((ViewGroup.MarginLayoutParams) mWorkModeSwitch.getLayoutParams()).bottomMargin =
workFabMarginBottom;
if (mWorkModeSwitch.getParent() != mAllApps) {
@@ -158,7 +162,6 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP
mWorkModeSwitch.updateCurrentState(mCurrentState == STATE_ENABLED);
return true;
}
/**
* Removes work profile toggle button from {@link BaseAllAppsContainerView}
*/