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

Commit 524e05b9 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Fix Taskabr Divider Line traveling too far" into main

parents 864c02a4 b7f42367

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

+9 −3
Original line number Original line Diff line number Diff line
@@ -714,13 +714,19 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
                continue;

                continue;

            }

            }





            int positionInHotseat;

            float positionInHotseat;

            if (isAllAppsButton || isTaskbarDividerView) {

            if (isAllAppsButton) {

                // Note that there is no All Apps button or taskbar divider view in the hotseat,

                // Note that there is no All Apps button in the hotseat,

                // this position is only used as its convenient for animation purposes.

                // this position is only used as its convenient for animation purposes.

                positionInHotseat = Utilities.isRtl(child.getResources())

                positionInHotseat = Utilities.isRtl(child.getResources())

                        ? taskbarDp.numShownHotseatIcons

                        ? taskbarDp.numShownHotseatIcons

                        : -1;

                        : -1;

            }  else if (isTaskbarDividerView) {

                // Note that there is no taskbar divider view in the hotseat,

                // this position is only used as its convenient for animation purposes.

                positionInHotseat = Utilities.isRtl(child.getResources())

                        ? taskbarDp.numShownHotseatIcons - 0.5f

                        : -0.5f;

            } else if (child.getTag() instanceof ItemInfo) {

            } else if (child.getTag() instanceof ItemInfo) {

                positionInHotseat = ((ItemInfo) child.getTag()).screenId;

                positionInHotseat = ((ItemInfo) child.getTag()).screenId;

            } else {

            } else {