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

Commit 988ed224 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reduce unnecessary redraw of wallpaper with shell transition" into... 

Merge "Reduce unnecessary redraw of wallpaper with shell transition" into tm-qpr-dev am: 6caa590a am: e3abfc10

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



Change-Id: I00b4442af6ec6d8e94653bfbf698c9fdfdb06221
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3947349c e3abfc10

services/core/java/com/android/server/wm/DisplayContent.java

+2 −1
Original line number Diff line number Diff line
@@ -6080,7 +6080,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                rootTask.ensureActivitiesVisible(starting, configChanges, preserveWindows,

                        notifyClients);

            });

            if (mTransitionController.isCollecting()

            if (mTransitionController.useShellTransitionsRotation()

                    && mTransitionController.isCollecting()

                    && mWallpaperController.getWallpaperTarget() != null) {

                // Also update wallpapers so that their requestedVisibility immediately reflects

                // the changes to activity visibility.

services/core/java/com/android/server/wm/Transition.java

+6 −1
Original line number Diff line number Diff line
@@ -300,7 +300,12 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
            }

        }

        if (mParticipants.contains(wc)) return;

        // Wallpaper is like in a static drawn state unless display may have changes, so exclude

        // the case to reduce transition latency waiting for the unchanged wallpaper to redraw.

        final boolean needSyncDraw = !isWallpaper(wc) || mParticipants.contains(wc.mDisplayContent);

        if (needSyncDraw) {

            mSyncEngine.addToSyncSet(mSyncId, wc);

        }

        ChangeInfo info = mChanges.get(wc);

        if (info == null) {

            info = new ChangeInfo(wc);