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

Commit d38c28e9 authored by Mykola Podolian's avatar Mykola Podolian Committed by Android (Google) Code Review
Browse files

Merge "Fixed quick search bar shrinking." into main

parents b986ac53 5bf8bffd
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -186,18 +186,20 @@ public class Hotseat extends CellLayout implements Insettable {
     */
    public void adjustForBubbleBar(boolean isBubbleBarVisible) {
        DeviceProfile dp = mActivity.getDeviceProfile();
        float adjustedBorderSpace = dp.getHotseatAdjustedBorderSpaceForBubbleBar(getContext());
        boolean adjustmentRequired = Float.compare(adjustedBorderSpace, 0f) != 0;

        ShortcutAndWidgetContainer icons = getShortcutsAndWidgets();
        AnimatorSet animatorSet = new AnimatorSet();

        // update the translation provider for future layout passes of hotseat icons.
        if (isBubbleBarVisible) {
        if (adjustmentRequired && isBubbleBarVisible) {
            icons.setTranslationProvider(
                    cellX -> dp.getHotseatAdjustedTranslation(getContext(), cellX));
        } else {
            icons.setTranslationProvider(null);
        }
        if (!adjustmentRequired) return;

        AnimatorSet animatorSet = new AnimatorSet();
        for (int i = 0; i < icons.getChildCount(); i++) {
            View child = icons.getChildAt(i);
            float tx = isBubbleBarVisible ? dp.getHotseatAdjustedTranslation(getContext(), i) : 0;