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

Commit dd55bbfb authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix issue when launching Camera" into oc-mr1-dev am: 5737af21 am: b0c86534"

parents fb527d2f 8702b0ad

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ public class AppWindowAnimator { 
        }

        }

        // Start out animation gone if window is gone, or visible if window is visible.

        // Start out animation gone if window is gone, or visible if window is visible.

        transformation.clear();

        transformation.clear();

        transformation.setAlpha(mAppToken.hasContentToDisplay() ? 1 : 0);

        transformation.setAlpha(mAppToken.isVisible() ? 1 : 0);

        hasTransformation = true;

        hasTransformation = true;

        mStackClip = stackClip;

        mStackClip = stackClip;
@@ -172,7 +172,7 @@ public class AppWindowAnimator { 
        animation = sDummyAnimation;

        animation = sDummyAnimation;

        hasTransformation = true;

        hasTransformation = true;

        transformation.clear();

        transformation.clear();

        transformation.setAlpha(mAppToken.hasContentToDisplay() ? 1 : 0);

        transformation.setAlpha(mAppToken.isVisible() ? 1 : 0);

    }

    }





    void setNullAnimation() {

    void setNullAnimation() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1497,7 +1497,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    // TODO: Another visibility method that was added late in the release to minimize risk.

    // TODO: Another visibility method that was added late in the release to minimize risk.

    @Override

    @Override

    public boolean canAffectSystemUiFlags() {

    public boolean canAffectSystemUiFlags() {

        final boolean shown = mWinAnimator.getShown();

        final boolean shown = mWinAnimator.getShown() && mWinAnimator.mShownAlpha > 0f;





        // We only consider the app to be exiting when the animation has started. After the app

        // We only consider the app to be exiting when the animation has started. After the app

        // transition is executed the windows are marked exiting before the new windows have been

        // transition is executed the windows are marked exiting before the new windows have been