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

Commit d15530f6 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Start dim animations on pending vs sync transaction" into rvc-dev am:... 

Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfe am: 40704774 am: 3712df59 am: 9754ddce

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

Change-Id: Idec12202cb8c0e3ddfeee97cbe3d6c1ebed59acd
parents 3865269b 9754ddce

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

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> { 
                mDimmer.resetDimStates();

            }



            if (mDimmer.updateDims(getSyncTransaction(), mTmpDimBoundsRect)) {

            if (mDimmer.updateDims(getPendingTransaction(), mTmpDimBoundsRect)) {

                scheduleAnimation();

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -3505,7 +3505,7 @@ class Task extends WindowContainer<WindowContainer> { 


        updateShadowsRadius(isFocused(), getSyncTransaction());



        if (mDimmer.updateDims(getSyncTransaction(), mTmpDimBoundsRect)) {

        if (mDimmer.updateDims(getPendingTransaction(), mTmpDimBoundsRect)) {

            scheduleAnimation();

        }

    }