Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Leon Scroggins
2021-05-12 21:02:05 +00:00
committed by Android (Google) Code Review
parent c9216d334b 4dda15cd27
commit 5183641bef
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import android.content.Context;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.os.SystemProperties;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import com.android.wm.shell.R; import com.android.wm.shell.R;
@@ -44,10 +43,7 @@ public class PipSurfaceTransactionHelper {
* @param context the current context * @param context the current context
*/ */
public void onDensityOrFontScaleChanged(Context context) { public void onDensityOrFontScaleChanged(Context context) {
final boolean enableCornerRadius = mCornerRadius = context.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius);
SystemProperties.getBoolean("debug.sf.enable_hole_punch_pip", false);
mCornerRadius = enableCornerRadius
? context.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius) : 0;
} }
/** /**

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

@@ -535,10 +535,8 @@ public class PipController implements PipTransitionController.PipTransitionCallb
private void onPipCornerRadiusChanged() { private void onPipCornerRadiusChanged() {
if (mPinnedStackAnimationRecentsCallback != null) { if (mPinnedStackAnimationRecentsCallback != null) {
final boolean enableCornerRadius = final int cornerRadius =
SystemProperties.getBoolean("debug.sf.enable_hole_punch_pip", false); mContext.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius);
final int cornerRadius = enableCornerRadius
? mContext.getResources().getDimensionPixelSize(R.dimen.pip_corner_radius) : 0;
try { try {
mPinnedStackAnimationRecentsCallback.onPipCornerRadiusChanged(cornerRadius); mPinnedStackAnimationRecentsCallback.onPipCornerRadiusChanged(cornerRadius);
} catch (RemoteException e) { } catch (RemoteException e) {

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

@@ -45,7 +45,6 @@ import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -152,11 +151,7 @@ public class PipMenuView extends FrameLayout {
mAccessibilityManager = context.getSystemService(AccessibilityManager.class); mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
inflate(context, R.layout.pip_menu, this); inflate(context, R.layout.pip_menu, this);
final boolean enableCornerRadius = mBackgroundDrawable = mContext.getDrawable(R.drawable.pip_menu_background);
SystemProperties.getBoolean("debug.sf.enable_hole_punch_pip", false);
mBackgroundDrawable = enableCornerRadius
? mContext.getDrawable(R.drawable.pip_menu_background)
: new ColorDrawable(Color.BLACK);
mBackgroundDrawable.setAlpha(0); mBackgroundDrawable.setAlpha(0);
mViewRoot = findViewById(R.id.background); mViewRoot = findViewById(R.id.background);
mViewRoot.setBackground(mBackgroundDrawable); mViewRoot.setBackground(mBackgroundDrawable);