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

Commit 2d4b8c2a authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I0d0f847625739dc60a078811df24647455baf1de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85eb65eb b6d64b38

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

+1 −1
Original line number Diff line number Diff line
@@ -1594,7 +1594,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            // source rect hint to enter PiP use bounds animation.

            if (sourceHintRect == null) {

                if (SystemProperties.getBoolean(

                        "persist.wm.debug.enable_pip_app_icon_overlay", false)) {

                        "persist.wm.debug.enable_pip_app_icon_overlay", true)) {

                    animator.setAppIconContentOverlay(

                            mContext, currentBounds, mTaskInfo.topActivityInfo);

                } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -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

                // animation.

                if (SystemProperties.getBoolean(

                        "persist.wm.debug.enable_pip_app_icon_overlay", false)) {

                        "persist.wm.debug.enable_pip_app_icon_overlay", true)) {

                    animator.setAppIconContentOverlay(

                            mContext, currentBounds, taskInfo.topActivityInfo);

                } else {

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ object Flags { 
    @Keep

    @JvmField

    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

    @Keep