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

Commit ed93274c authored by Matt Sziklay's avatar Matt Sziklay Committed by Automerger Merge Worker
Browse files

Merge "Match window rounded corners with system rounded corners." into... 

Merge "Match window rounded corners with system rounded corners." into udc-qpr-dev am: 7493f376 am: b6911d37

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23716130



Change-Id: I6eb752b84e99332830137d5c0585dfb237b59259
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 968d9b9d b6911d37

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+3 −6
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Context; 
import android.content.pm.ApplicationInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.graphics.Point;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.Rect;
@@ -39,6 +38,7 @@ import android.view.View; 
import android.view.ViewConfiguration;

import android.view.ViewConfiguration;

import android.window.WindowContainerTransaction;

import android.window.WindowContainerTransaction;





import com.android.internal.policy.ScreenDecorationsUtils;

import com.android.launcher3.icons.IconProvider;

import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.R;

import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;
@@ -182,11 +182,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        mRelayoutParams.mShadowRadiusId = shadowRadiusID;

        mRelayoutParams.mShadowRadiusId = shadowRadiusID;

        mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw;

        mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw;





        final TypedArray ta = mContext.obtainStyledAttributes(

        mRelayoutParams.mCornerRadius =

                new int[]{android.R.attr.dialogCornerRadius});

                (int) ScreenDecorationsUtils.getWindowCornerRadius(mContext);

        mRelayoutParams.mCornerRadius = ta.getDimensionPixelSize(0, 0);

        ta.recycle();



        relayout(mRelayoutParams, startT, finishT, wct, oldRootView, mResult);

        relayout(mRelayoutParams, startT, finishT, wct, oldRootView, mResult);

        // After this line, mTaskInfo is up-to-date and should be used instead of taskInfo

        // After this line, mTaskInfo is up-to-date and should be used instead of taskInfo