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

Commit a329718d authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Remove extra overview threshold if the transient taskbar is already open" into tm-qpr-dev

parents 51971444 7d192c0e

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+7 −4
Original line number Diff line number Diff line
@@ -369,7 +369,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                .getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get()

                        ? R.dimen.taskbar_app_window_threshold_v2

                        : R.dimen.taskbar_app_window_threshold);

        mTaskbarHomeOverviewThreshold = res.getDimensionPixelSize(

        boolean swipeWillNotShowTaskbar = mTaskbarAlreadyOpen;

        mTaskbarHomeOverviewThreshold = swipeWillNotShowTaskbar

                ? 0

                : res.getDimensionPixelSize(

                        ENABLE_TASKBAR_REVISED_THRESHOLDS.get()

                                ? R.dimen.taskbar_home_overview_threshold_v2

                                : R.dimen.taskbar_home_overview_threshold);