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

Verified Commit 5eef3236 authored by Kshitij's avatar Kshitij Committed by Saalim Quadri
Browse files

feat: Fix hotseat & taskbar item positions, remove all apps 



Signed-off-by: default avatarSaalim Quadri <danascape@gmail.com>
parent 01f13ef2

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

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
            mTaskbarDividerContainer = new TaskbarDividerContainer(context);

        }



        if (Flags.taskbarOverflow()) {

        if (FeatureFlags.ENABLE_TASKBAR_ALLAPPS.get() && Flags.taskbarOverflow()) {

            mTaskbarOverflowView = (IconButtonView) LayoutInflater.from(context)

                    .inflate(R.layout.taskbar_overflow_button, this, false);

            mTaskbarOverflowView.setIconDrawable(
@@ -602,7 +602,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 


        // Layout the children

        mIconLayoutBounds.right = iconEnd;

        mIconLayoutBounds.top = (bottom - top - mIconTouchSize) / 2;

        mIconLayoutBounds.top = (bottom - top - mIconTouchSize);

        mIconLayoutBounds.bottom = mIconLayoutBounds.top + mIconTouchSize;

        int count = getChildCount();

        for (int i = count; i > 0; i--) {

src/com/android/launcher3/DeviceProfile.java

+9 −1
Original line number Diff line number Diff line
@@ -1936,7 +1936,15 @@ public class DeviceProfile { 
            }

        } else if (isTaskbarPresent) {

            // Center the QSB vertically with hotseat

            int hotseatBarBottomPadding = getHotseatBarBottomPadding();

            boolean noHint = isFullyGesture && LineageSettings.System.getInt(

                    context.getContentResolver(), LineageSettings.System.NAVIGATION_BAR_HINT, 0) != 1;

            int hotseatIconMargin = Math.abs(hotseatCellHeightPx - iconSizePx);

            // Values obtained by manual validation, independent of dpi and display scale

            double marginScaleFactor = isFullyGesture

                    ? (noHint ? 2.5 : 3.25)

                    : 2.75;

            int hotseatBarBottomPadding = getHotseatBarBottomPadding() -

                    (int) (marginScaleFactor * hotseatIconMargin);

            int hotseatBarTopPadding =

                    hotseatBarSizePx - hotseatBarBottomPadding - hotseatCellHeightPx;

            int hotseatWidth = getHotseatRequiredWidth();

src/com/android/launcher3/config/FeatureFlags.java

+4 −0
Original line number Diff line number Diff line
@@ -259,6 +259,10 @@ public final class FeatureFlags { 
        return flagState;

    }



    public static final BooleanFlag ENABLE_TASKBAR_ALLAPPS = getDebugFlag(-1,

            "ENABLE_TASKBAR_ALLAPPS", false,

            "Enables all apps button in taskbar");



    public static BooleanFlag getReleaseFlag(

            int bugId, String key, BooleanFlag flagState, String description) {

        return flagState;