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

Commit c0b0e4f2 authored by Yash Garg's avatar Yash Garg 💬 Committed by Saalim Quadri
Browse files

fix(dock): properly space in gesture mode 



[SahilSonar - adapted to A14]

Signed-off-by: default avatarSahilSonar <sss.sonar2003@gmail.com>
Signed-off-by: default avatarSaalim Quadri <danascape@gmail.com>
parent 10d9fc55

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
    <dimen name="min_qsb_margin">8dp</dimen>



    <!-- Workspace page indicator -->

    <dimen name="workspace_page_indicator_height">24dp</dimen>

    <dimen name="workspace_page_indicator_height">32dp</dimen>

    <dimen name="workspace_page_indicator_line_height">1dp</dimen>

    <dimen name="workspace_page_indicator_overlap_workspace">0dp</dimen>

src/com/android/launcher3/Hotseat.java

+9 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.view.ViewDebug; 
import android.view.ViewGroup;

import android.widget.FrameLayout;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.util.NavigationMode;

import com.android.launcher3.util.window.WindowManagerProxy;



import androidx.annotation.IntDef;
@@ -221,6 +223,8 @@ public class Hotseat extends CellLayout implements Insettable, OffsetParent { 
    public void setInsets(Rect insets) {

        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();

        DeviceProfile grid = mActivity.getDeviceProfile();

        WindowManagerProxy wm = WindowManagerProxy.newInstance(getContext());

        boolean isFullyGesture = wm.getNavigationMode(getContext()) == NavigationMode.NO_BUTTON;



        if (grid.isVerticalBarLayout()) {

            mQsb.setVisibility(View.GONE);
@@ -236,7 +240,11 @@ public class Hotseat extends CellLayout implements Insettable, OffsetParent { 
            mQsb.setVisibility(View.VISIBLE);

            lp.gravity = Gravity.BOTTOM;

            lp.width = ViewGroup.LayoutParams.MATCH_PARENT;

            if (isFullyGesture) {

                lp.height = grid.hotseatBarSizePx;

            } else {

                lp.height = grid.hotseatBarSizePx + 24;

            }

        }



        Rect padding = grid.getHotseatLayoutPadding(getContext());