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

Commit 4397f033 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev 

am: cff260ad

Change-Id: Iad8a5b4524d70801eeb7b4abb14626b3ae127e32
parents 0b4b9f9c cff260ad

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

+5 −0
Original line number Diff line number Diff line
@@ -170,6 +170,11 @@ class SurfaceControlWithBackground extends SurfaceControl { 
        // Track overall progress of animation by computing cropped portion of status bar.

        final Rect contentInsets = mWindowSurfaceController.mAnimator.mWin.mContentInsets;

        float d = contentInsets.top == 0 ? 0 : (float) crop.top / contentInsets.top;

        if (d > 1.f) {

            // We're running expand animation from launcher, won't compute custom bg crop here.

            mTmpContainerRect.set(crop);

            return;

        }



        // Compute additional offset for the background when app window is positioned not at (0,0).

        // E.g. landscape with navigation bar on the left.