Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tiger Huang
2019-04-24 14:59:09 +00:00
committed by Android (Google) Code Review
parent f2e3c4f47d dc50bb50f9
commit 97af1b385e
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/AppWindowThumbnail.java
View File

@@ -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 */);
}

4
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -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;

2
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -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();

4
services/core/java/com/android/server/wm/WindowToken.java
View File

@@ -345,4 +345,8 @@ class WindowToken extends WindowContainer<WindowState> {
mOwnerCanManageAppTokens);
return mOwnerCanManageAppTokens && (layer > navLayer);
}
float getWindowCornerRadiusForAnimation() {
return mDisplayContent.isDefaultDisplay ? mWmService.mWindowCornerRadius : 0;
}
}