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

Commit 39a7760e authored by Zak Cohen's avatar Zak Cohen Committed by Android (Google) Code Review
Browse files

Merge "Make it possible to set a bottom margin on the task thumbnail view."... 

Merge "Make it possible to set a bottom margin on the task thumbnail view." into ub-launcher3-master
parents ec30c5ed b0533716

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+5 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
    private final float mFastFlingVelocity;

    private final RecentsModel mModel;

    private final int mTaskTopMargin;

    private final int mTaskBottomMargin;

    private final ClearAllButton mClearAllButton;

    private final Rect mClearAllButtonDeadZoneRect = new Rect();

    private final Rect mTaskViewDeadZoneRect = new Rect();
@@ -343,6 +344,8 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        setLayoutDirection(mIsRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR);

        mTaskTopMargin = getResources()

                .getDimensionPixelSize(R.dimen.task_thumbnail_top_margin);

        mTaskBottomMargin = getResources().getDimensionPixelSize(

                R.dimen.task_thumbnail_bottom_margin);

        mSquaredTouchSlop = squaredTouchSlop(context);



        mEmptyIcon = context.getDrawable(R.drawable.ic_empty_recents);
@@ -696,6 +699,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
        mTaskHeight = mTempRect.height();



        mTempRect.top -= mTaskTopMargin;

        mTempRect.bottom += mTaskBottomMargin;

        setPadding(mTempRect.left - mInsets.left, mTempRect.top - mInsets.top,

                dp.widthPx - mInsets.right - mTempRect.right,

                dp.heightPx - mInsets.bottom - mTempRect.bottom);
@@ -1467,7 +1471,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 


        // Set the pivot points to match the task preview center

        setPivotY(((mInsets.top + getPaddingTop() + mTaskTopMargin)

                + (getHeight() - mInsets.bottom - getPaddingBottom())) / 2);

                + (getHeight() - mInsets.bottom - getPaddingBottom() - mTaskBottomMargin)) / 2);

        setPivotX(((mInsets.left + getPaddingLeft())

                + (getWidth() - mInsets.right - getPaddingRight())) / 2);

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java

+7 −2
Original line number Diff line number Diff line
@@ -540,8 +540,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
            }



            addView(view, indexToAdd);

            ((LayoutParams) view.getLayoutParams()).gravity =

            LayoutParams layoutParams = (LayoutParams) view.getLayoutParams();

            layoutParams.gravity =

                    Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;

            layoutParams.bottomMargin =

                    ((MarginLayoutParams) mSnapshotView.getLayoutParams()).bottomMargin;

            view.setAlpha(mFooterAlpha);

            mFooters[index] = new FooterWrapper(view);

            if (shouldAnimateEntry) {
@@ -618,10 +621,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
    private static final class TaskOutlineProvider extends ViewOutlineProvider {



        private final int mMarginTop;

        private final int mMarginBottom;

        private FullscreenDrawParams mFullscreenParams;



        TaskOutlineProvider(Resources res, FullscreenDrawParams fullscreenParams) {

            mMarginTop = res.getDimensionPixelSize(R.dimen.task_thumbnail_top_margin);

            mMarginBottom = res.getDimensionPixelSize(R.dimen.task_thumbnail_bottom_margin);

            mFullscreenParams = fullscreenParams;

        }
@@ -636,7 +641,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
            outline.setRoundRect(0,

                    (int) (mMarginTop * scale),

                    (int) ((insets.left + view.getWidth() + insets.right) * scale),

                    (int) ((insets.top + view.getHeight() + insets.bottom) * scale),

                    (int) ((insets.top + view.getHeight() + insets.bottom - mMarginBottom) * scale),

                    mFullscreenParams.mCurrentDrawnCornerRadius);

        }

    }

quickstep/res/layout/task.xml

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
        android:id="@+id/snapshot"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginTop="@dimen/task_thumbnail_top_margin"/>

        android:layout_marginTop="@dimen/task_thumbnail_top_margin"

        android:layout_marginBottom="@dimen/task_thumbnail_bottom_margin"/>



    <com.android.quickstep.views.IconView

        android:id="@+id/icon"

quickstep/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


    <dimen name="task_thumbnail_top_margin">24dp</dimen>

    <dimen name="task_thumbnail_half_top_margin">12dp</dimen>

    <!-- Can be overridden in overlays. -->

    <dimen name="task_thumbnail_bottom_margin">0dp</dimen>

    <dimen name="task_thumbnail_icon_size">48dp</dimen>

    <!-- For screens without rounded corners -->

    <dimen name="task_corner_radius_small">2dp</dimen>

quickstep/src/com/android/quickstep/util/LayoutUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ public class LayoutUtils { 
        }



        float topIconMargin = res.getDimension(R.dimen.task_thumbnail_top_margin);

        float bottomMargin = res.getDimension(R.dimen.task_thumbnail_bottom_margin);

        float paddingVert = res.getDimension(R.dimen.task_card_vert_space);



        // Note this should be same as dp.availableWidthPx and dp.availableHeightPx unless
@@ -113,7 +114,7 @@ public class LayoutUtils { 
        int launcherVisibleHeight = dp.heightPx - insets.top - insets.bottom;



        float availableHeight = launcherVisibleHeight

                - topIconMargin - extraVerticalSpace - paddingVert;

                - topIconMargin - extraVerticalSpace - paddingVert - bottomMargin;

        float availableWidth = launcherVisibleWidth - paddingHorz;



        float scale = Math.min(availableWidth / taskWidth, availableHeight / taskHeight);