Merge "Turn on rounded corners on PIP with a flag" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-04-20 23:24:00 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 2 deletions

View File

@@ -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);
}
/**

View File

@@ -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);