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

Commit 0dfd32df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Turn on rounded corners on PIP with a flag" into sc-dev am: 466a9e2b 

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

Change-Id: Ic2e497cf662472f30aed8bb5f13b04df4db2529b
parents 489942ac 466a9e2b

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

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.res.Resources; 
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;
@@ -42,7 +43,8 @@ public class PipSurfaceTransactionHelper { 


    public PipSurfaceTransactionHelper(Context context) {

        final Resources res = context.getResources();

        mEnableCornerRadius = res.getBoolean(R.bool.config_pipEnableRoundCorner);

        mEnableCornerRadius = res.getBoolean(R.bool.config_pipEnableRoundCorner)

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

    }



    /**

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

+3 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 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;
@@ -131,7 +132,8 @@ public class PipMenuView extends FrameLayout { 
        inflate(context, R.layout.pip_menu, this);



        final boolean enableCornerRadius = mContext.getResources()

                .getBoolean(R.bool.config_pipEnableRoundCorner);

                .getBoolean(R.bool.config_pipEnableRoundCorner)

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

        mBackgroundDrawable = enableCornerRadius

                ? mContext.getDrawable(R.drawable.pip_menu_background)

                : new ColorDrawable(Color.BLACK);