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

Commit 3b66b092 authored by Tiger Huang's avatar Tiger Huang Committed by android-build-merger
Browse files

Merge "Don't apply rounded-corner animation on non-default display" into qt-dev 

am: 97af1b38

Change-Id: Ia59cff5885fda044bc945713a19645193b8d906d
parents 14b37232 97af1b38

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

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ class AppWindowThumbnail implements Animatable { 
        mSurfaceAnimator.startAnimation(t, new LocalAnimationAdapter(

                new WindowAnimationSpec(anim, position,

                        mAppToken.getDisplayContent().mAppTransition.canSkipFirstFrame(),

                        mAppToken.mWmService.mWindowCornerRadius),

                        mAppToken.getWindowCornerRadiusForAnimation()),

                mAppToken.mWmService.mSurfaceAnimationRunner), false /* hidden */);

    }

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

+1 −3
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; 
import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.content.pm.ActivityInfo.COLOR_MODE_DEFAULT;

import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION;

import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;

import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
@@ -2542,7 +2540,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
                                    getDisplayContent().mAppTransition.canSkipFirstFrame(),

                                    appStackClipMode,

                                    true /* isAppAnimation */,

                                    mWmService.mWindowCornerRadius),

                                    getWindowCornerRadiusForAnimation()),

                            mWmService.mSurfaceAnimationRunner);

                    if (a.getZAdjustment() == Animation.ZORDER_TOP) {

                        mNeedsZBoost = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -4553,7 +4553,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        anim.scaleCurrentDuration(mWmService.getWindowAnimationScaleLocked());

        final AnimationAdapter adapter = new LocalAnimationAdapter(

                new WindowAnimationSpec(anim, mSurfacePosition, false /* canSkipFirstFrame */,

                        mWmService.mWindowCornerRadius),

                        mToken.getWindowCornerRadiusForAnimation()),

                mWmService.mSurfaceAnimationRunner);

        startAnimation(mPendingTransaction, adapter);

        commitPendingTransaction();

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

+4 −0
Original line number Diff line number Diff line
@@ -345,4 +345,8 @@ class WindowToken extends WindowContainer<WindowState> { 
                mOwnerCanManageAppTokens);

        return mOwnerCanManageAppTokens && (layer > navLayer);

    }



    float getWindowCornerRadiusForAnimation() {

        return mDisplayContent.isDefaultDisplay ? mWmService.mWindowCornerRadius : 0;

    }

}