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

Commit a5cd3c32 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hide chips if loaded in select mode." into sc-dev

parents 1764c7ee 59b5e241

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

+10 −14
Original line number Original line Diff line number Diff line
@@ -298,7 +298,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
    private boolean mEndQuickswitchCuj;

    private boolean mEndQuickswitchCuj;





    private View mContextualChipWrapper;

    private View mContextualChipWrapper;

    private View mContextualChip;

    private final float[] mIconCenterCoords = new float[2];

    private final float[] mIconCenterCoords = new float[2];

    private final float[] mChipCenterCoords = new float[2];

    private final float[] mChipCenterCoords = new float[2];
@@ -447,9 +446,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        }

        }

        mModalness = modalness;

        mModalness = modalness;

        mIconView.setAlpha(comp(modalness));

        mIconView.setAlpha(comp(modalness));

        if (mContextualChip != null) {

        if (mContextualChipWrapper != null) {

            mContextualChip.setScaleX(comp(modalness));

            mContextualChipWrapper.setScaleX(comp(modalness));

            mContextualChip.setScaleY(comp(modalness));

            mContextualChipWrapper.setScaleY(comp(modalness));

        }

        }

        mDigitalWellBeingToast.updateBannerOffset(modalness,

        mDigitalWellBeingToast.updateBannerOffset(modalness,

                mCurrentFullscreenParams.mCurrentDrawnInsets.top

                mCurrentFullscreenParams.mCurrentDrawnInsets.top
@@ -689,10 +688,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
                .getInterpolation(progress);

                .getInterpolation(progress);

        mIconView.setScaleX(scale);

        mIconView.setScaleX(scale);

        mIconView.setScaleY(scale);

        mIconView.setScaleY(scale);

        if (mContextualChip != null && mContextualChipWrapper != null) {

        if (mContextualChipWrapper != null && mContextualChipWrapper != null) {

            mContextualChipWrapper.setAlpha(scale);

            mContextualChipWrapper.setAlpha(scale);

            mContextualChip.setScaleX(scale);

            mContextualChipWrapper.setScaleX(Math.min(scale, comp(mModalness)));

            mContextualChip.setScaleY(scale);

            mContextualChipWrapper.setScaleY(Math.min(scale, comp(mModalness)));

        }

        }

        mDigitalWellBeingToast.updateBannerOffset(1f - scale,

        mDigitalWellBeingToast.updateBannerOffset(1f - scale,

                mCurrentFullscreenParams.mCurrentDrawnInsets.top

                mCurrentFullscreenParams.mCurrentDrawnInsets.top
@@ -797,14 +796,12 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
            int expectedChipHeight = getExpectedViewHeight(view);

            int expectedChipHeight = getExpectedViewHeight(view);

            float chipOffset = getResources().getDimension(R.dimen.chip_hint_vertical_offset);

            float chipOffset = getResources().getDimension(R.dimen.chip_hint_vertical_offset);

            layoutParams.bottomMargin = -expectedChipHeight - (int) chipOffset;

            layoutParams.bottomMargin = -expectedChipHeight - (int) chipOffset;

            mContextualChip = ((FrameLayout) mContextualChipWrapper).getChildAt(0);

            mContextualChipWrapper.setScaleX(0f);

            mContextualChip.setScaleX(0f);

            mContextualChipWrapper.setScaleY(0f);

            mContextualChip.setScaleY(0f);

            addView(view, getChildCount(), layoutParams);

            addView(view, getChildCount(), layoutParams);

            if (mContextualChip != null) {

                mContextualChip.animate().scaleX(1f).scaleY(1f).setDuration(50);

            }

            if (mContextualChipWrapper != null) {

            if (mContextualChipWrapper != null) {

                float scale = comp(mModalness);

                mContextualChipWrapper.animate().scaleX(scale).scaleY(scale).setDuration(50);

                mChipTouchDelegate = new TransformingTouchDelegate(mContextualChipWrapper);

                mChipTouchDelegate = new TransformingTouchDelegate(mContextualChipWrapper);

            }

            }

        }

        }
@@ -825,7 +822,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        }

        }

        View oldContextualChipWrapper = mContextualChipWrapper;

        View oldContextualChipWrapper = mContextualChipWrapper;

        mContextualChipWrapper = null;

        mContextualChipWrapper = null;

        mContextualChip = null;

        mChipTouchDelegate = null;

        mChipTouchDelegate = null;

        return oldContextualChipWrapper;

        return oldContextualChipWrapper;

    }

    }