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

Commit 2aec9c42 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Change task view / all apps/ widgets / folder radius to dialogCornerRadius 

Bug: 123985787
Change-Id: Iaa8088beb51d37dba90d57ad065f9eac0dd46270
parent 2a059c78

quickstep/recents_ui_overrides/src/com/android/quickstep/util/ClipAnimationHelper.java

+2 −3
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.launcher3.BaseDraggingActivity; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.util.Themes;

import com.android.launcher3.views.BaseDragLayer;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.views.RecentsView;
@@ -101,9 +102,7 @@ public class ClipAnimationHelper { 
    public ClipAnimationHelper(Context context) {

        mWindowCornerRadius = getWindowCornerRadius(context.getResources());

        mSupportsRoundedCornersOnWindows = supportsRoundedCornersOnWindows(context.getResources());

        int taskCornerRadiusRes = mSupportsRoundedCornersOnWindows ?

                R.dimen.task_corner_radius : R.dimen.task_corner_radius_small;

        mTaskCornerRadius = context.getResources().getDimension(taskCornerRadiusRes);

        mTaskCornerRadius = Themes.getDialogCornerRadius(context);

    }



    private void updateSourceStack(RemoteAnimationTargetCompat target) {

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

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.launcher3.R; 
import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.anim.RoundedRectRevealOutlineProvider;

import com.android.launcher3.util.Themes;

import com.android.launcher3.views.BaseDragLayer;

import com.android.quickstep.TaskSystemShortcut;

import com.android.quickstep.TaskUtils;
@@ -270,7 +271,7 @@ public class TaskMenuView extends AbstractFloatingView { 
    }



    private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {

        float radius = getResources().getDimension(R.dimen.task_corner_radius);

        float radius = Themes.getDialogCornerRadius(getContext());

        Rect fromRect = new Rect(0, 0, getWidth(), 0);

        Rect toRect = new Rect(0, 0, getWidth(), getHeight());

        return new RoundedRectRevealOutlineProvider(radius, radius, fromRect, toRect);

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

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class TaskThumbnailView extends View { 


    public TaskThumbnailView(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        mCornerRadius = getResources().getDimension(R.dimen.task_corner_radius);

        mCornerRadius = Themes.getDialogCornerRadius(context);

        mOverlay = TaskOverlayFactory.INSTANCE.get(context).createOverlay(this);

        mPaint.setFilterBitmap(true);

        mBackgroundPaint.setColor(Color.WHITE);

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

+4 −3
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.launcher3.anim.Interpolators; 
import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.PendingAnimation;

import com.android.launcher3.util.Themes;

import com.android.launcher3.util.ViewPool.Reusable;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.TaskIconCache;
@@ -196,7 +197,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
            fromContext(context).getStatsLogManager().logTaskLaunch(getRecentsView(),

                    TaskUtils.getLaunchComponentKeyForTask(getTask().key));

        });

        setOutlineProvider(new TaskOutlineProvider(getResources()));

        setOutlineProvider(new TaskOutlineProvider(context, getResources()));

    }



    @Override
@@ -514,9 +515,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        private final int mMarginTop;

        private final float mRadius;



        TaskOutlineProvider(Resources res) {

        TaskOutlineProvider(Context context, Resources res) {

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

            mRadius = res.getDimension(R.dimen.task_corner_radius);

            mRadius = Themes.getDialogCornerRadius(context);

        }



        @Override

quickstep/res/drawable/bg_wellbeing_toast.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <solid android:color="#E61A73E8" />

    <corners android:radius="@dimen/task_corner_radius" />

    <corners android:radius="?android:attr/dialogCornerRadius" />

</shape>
 
 No newline at end of file