From 4dda15cd27f337fab937ba9ecfeb38421d219ad5 Mon Sep 17 00:00:00 2001
From: Leon Scroggins III <scroggo@google.com>
Date: Mon, 15 Mar 2021 15:54:41 -0400
Subject: [PATCH] PIP: Always enable rounded corners

Bug: 187922869

Previously, we turned on rounded corners with a sysprop in
bf309e63d4deaca7b0946913ea18438f3bfee6d8. Now that a bug in rendering
them in landscape has been fixed, remove the sysprop and always use
the rounded corners radius specified in the xml file.

Change-Id: Ib0f61bbcbee6ead82beec2b149b0892836492b78
---
 .../android/wm/shell/pip/PipSurfaceTransactionHelper.java  | 6 +-----
 .../src/com/android/wm/shell/pip/phone/PipController.java  | 6 ++----
 .../src/com/android/wm/shell/pip/phone/PipMenuView.java    | 7 +------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java
index 319d57a633209..48a15d8686b45 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipSurfaceTransactionHelper.java
@@ -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);
     }
 
     /**
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
index 29a483bd7ae30..91e38872e3d0b 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
@@ -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) {
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
index ecbf0f128b5c6..52cfbf1c8b64e 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuView.java
@@ -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);