Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 241293aa authored by Brandon Dayauon's avatar Brandon Dayauon
Browse files

Fixed overlap issue where toggle button gets overlapped by 3 button nav... 

Fixed overlap issue where toggle button gets overlapped by 3 button nav bar..now button shifts up so it's not totally obscured

Test: Manual - On Raven
Before: https://screenshot.googleplex.com/sYq2i7YGjqmMjXe
After: https://screenshot.googleplex.com/9WRtgisGChisbFj
Bug: 223996104
Change-Id: Ic302e26b2fb6db9a9e06b335c753266e92b6c671
parent cdcbebb7

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

+4 −1
Original line number Diff line number Diff line
@@ -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}

     */