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

Commit 632444a2 authored by Pat Manning's avatar Pat Manning Committed by Android (Google) Code Review
Browse files

Merge "Add 4dp vertical offset to taskbar hover tooltip." into main

parents f35a6013 fd2f14c8

quickstep/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ 
    <dimen name="transient_taskbar_stash_spring_velocity_dp_per_s">400dp</dimen>

    <dimen name="taskbar_tooltip_vertical_padding">8dp</dimen>

    <dimen name="taskbar_tooltip_horizontal_padding">16dp</dimen>

    <dimen name="taskbar_tooltip_y_offset">4dp</dimen>



    <!-- An additional touch slop to prevent x-axis movement during the swipe up to show taskbar -->

    <dimen name="transient_taskbar_clamped_offset_bound">16dp</dimen>

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

+5 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class TaskbarHoverToolTipController implements View.OnHoverListener { 
    private final View mHoverView;

    private final ArrowTipView mHoverToolTipView;

    private final String mToolTipText;

    private final int mYOffset;



    public TaskbarHoverToolTipController(TaskbarActivityContext activity, TaskbarView taskbarView,

            View hoverView) {
@@ -79,6 +80,8 @@ public class TaskbarHoverToolTipController implements View.OnHoverListener { 
        mHoverToolTipView.findViewById(R.id.text).setPadding(horizontalPadding, verticalPadding,

                horizontalPadding, verticalPadding);

        mHoverToolTipView.setAlpha(0);

        mYOffset = arrowContextWrapper.getResources().getDimensionPixelSize(

                R.dimen.taskbar_tooltip_y_offset);



        AnimatorSet hoverOpenAnimator = new AnimatorSet();

        ObjectAnimator alphaOpenAnimator = ObjectAnimator.ofFloat(mHoverToolTipView, ALPHA, 0f, 1f);
@@ -89,7 +92,7 @@ public class TaskbarHoverToolTipController implements View.OnHoverListener { 
        mHoverToolTipView.addOnLayoutChangeListener(

                (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {

                    mHoverToolTipView.setPivotY(bottom);

                    mHoverToolTipView.setY(mTaskbarView.getTop() - (bottom - top));

                    mHoverToolTipView.setY(mTaskbarView.getTop() - mYOffset - (bottom - top));

                });

    }
@@ -121,6 +124,6 @@ public class TaskbarHoverToolTipController implements View.OnHoverListener { 
        }

        Rect iconViewBounds = Utilities.getViewBounds(mHoverView);

        mHoverToolTipView.showAtLocation(mToolTipText, iconViewBounds.centerX(),

                mTaskbarView.getTop(), /* shouldAutoClose= */ false);

                mTaskbarView.getTop() - mYOffset, /* shouldAutoClose= */ false);

    }

}