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

Merge "Turn ENABLE_PIP_APP_ICON_OVERLAY on by default" into tm-qpr-dev am: d2d4b4c216

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

Change-Id: I625b5314e6af10f88979038e1af095f6833139ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2023-03-06 17:50:08 +00:00
committed by Automerger Merge Worker
parent 370f66ae6f d2d4b4c216
commit b6d64b382d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
View File

@@ -1594,7 +1594,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
// source rect hint to enter PiP use bounds animation. // source rect hint to enter PiP use bounds animation.
if (sourceHintRect == null) { if (sourceHintRect == null) {
if (SystemProperties.getBoolean( if (SystemProperties.getBoolean(
"persist.wm.debug.enable_pip_app_icon_overlay", false)) { "persist.wm.debug.enable_pip_app_icon_overlay", true)) {
animator.setAppIconContentOverlay( animator.setAppIconContentOverlay(
mContext, currentBounds, mTaskInfo.topActivityInfo); mContext, currentBounds, mTaskInfo.topActivityInfo);
} else { } else {

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
View File

@@ -804,7 +804,7 @@ public class PipTransition extends PipTransitionController {
// We use content overlay when there is no source rect hint to enter PiP use bounds // We use content overlay when there is no source rect hint to enter PiP use bounds
// animation. // animation.
if (SystemProperties.getBoolean( if (SystemProperties.getBoolean(
"persist.wm.debug.enable_pip_app_icon_overlay", false)) { "persist.wm.debug.enable_pip_app_icon_overlay", true)) {
animator.setAppIconContentOverlay( animator.setAppIconContentOverlay(
mContext, currentBounds, taskInfo.topActivityInfo); mContext, currentBounds, taskInfo.topActivityInfo);
} else { } else {

2
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -480,7 +480,7 @@ object Flags {
@Keep @Keep
@JvmField @JvmField
val ENABLE_PIP_APP_ICON_OVERLAY = val ENABLE_PIP_APP_ICON_OVERLAY =
sysPropBooleanFlag(1115, "persist.wm.debug.enable_pip_app_icon_overlay", default = false) sysPropBooleanFlag(1115, "persist.wm.debug.enable_pip_app_icon_overlay", default = true)
// 1200 - predictive back // 1200 - predictive back
@Keep @Keep