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

Commit db202abe authored by Samuel Fufa's avatar Samuel Fufa Committed by android-build-merger
Browse files

Merge "Fix ScrimView caret alignment and ignore touches" into ub-launcher3-qt-future-dev 

am: d69327e9

Change-Id: Ia19d766bdeb5d2a4023b1c408bddfe30e4de4dac
parents 703d47e7 d69327e9

quickstep/src/com/android/quickstep/views/ShelfScrimView.java

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public class ShelfScrimView extends ScrimView implements NavigationModeChangeLis 
                mMidProgress =  OVERVIEW.getVerticalProgress(mLauncher);

                Rect hotseatPadding = dp.getHotseatLayoutPadding();

                int hotseatSize = dp.hotseatBarSizePx + dp.getInsets().bottom

                        - hotseatPadding.bottom - hotseatPadding.top;

                        + hotseatPadding.bottom + hotseatPadding.top;

                float dragHandleTop =

                        Math.min(hotseatSize, OverviewState.getDefaultSwipeHeight(context, dp));

                mDragHandleProgress =  1 - (dragHandleTop / mShiftRange);

src/com/android/launcher3/views/ScrimView.java

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ public class ScrimView extends View implements Insettable, OnChangeListener, 
            anim.addUpdateListener((v) -> invalidate(invalidateRegion));

            getOverlay().add(drawable);

            anim.start();

            return true;

        }

        return value;

    }