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

Commit a5b13d0c authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "PIP: Always enable rounded corners" into sc-dev am: 5183641b 

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

Change-Id: I6ba14d80f451e92e49de22b297dc6dd01c8b3bd7
parents 1d193f66 5183641b

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java

+1 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context; 
import android.graphics.Matrix;

import android.graphics.Rect;

import android.graphics.RectF;

import android.os.SystemProperties;

import android.view.SurfaceControl;



import com.android.wm.shell.R;
@@ -44,10 +43,7 @@ public class PipSurfaceTransactionHelper { 
     * @param context the current context

     */

    public void onDensityOrFontScaleChanged(Context context) {

        final boolean enableCornerRadius =

                SystemProperties.getBoolean("debug.sf.enable_hole_punch_pip", false);

        mCornerRadius = enableCornerRadius

                ? context.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius) : 0;

        mCornerRadius = context.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius);

    }



    /**

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+2 −4
Original line number Diff line number Diff line
@@ -535,10 +535,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb 


    private void onPipCornerRadiusChanged() {

        if (mPinnedStackAnimationRecentsCallback != null) {

            final boolean enableCornerRadius =

                    SystemProperties.getBoolean("debug.sf.enable_hole_punch_pip", false);

            final int cornerRadius = enableCornerRadius

                    ? mContext.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius) : 0;

            final int cornerRadius =

                    mContext.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius);

            try {

                mPinnedStackAnimationRecentsCallback.onPipCornerRadiusChanged(cornerRadius);

            } catch (RemoteException e) {

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java

+1 −6
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.graphics.drawable.Drawable; 
import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.util.Log;

import android.util.Pair;
@@ -152,11 +151,7 @@ public class PipMenuView extends FrameLayout { 
        mAccessibilityManager = context.getSystemService(AccessibilityManager.class);

        inflate(context, R.layout.pip_menu, this);



        final boolean enableCornerRadius =

                SystemProperties.getBoolean("debug.sf.enable_hole_punch_pip", false);

        mBackgroundDrawable = enableCornerRadius

                ? mContext.getDrawable(R.drawable.pip_menu_background)

                : new ColorDrawable(Color.BLACK);

        mBackgroundDrawable = mContext.getDrawable(R.drawable.pip_menu_background);

        mBackgroundDrawable.setAlpha(0);

        mViewRoot = findViewById(R.id.background);

        mViewRoot.setBackground(mBackgroundDrawable);