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

Merge "Make Activity#overrideActivityTransition handle invalid resId." into udc-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2023-03-06 10:03:37 +00:00
committed by Android (Google) Code Review
parent c521c01b56 2ab723a787
commit dd887408f2
2 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libs/WindowManager/Shell/src/com/android/wm/shell/transition/TransitionAnimationHelper.java
View File

@@ -143,8 +143,12 @@ public class TransitionAnimationHelper {
Animation a = null;
if (animAttr != 0) {
if (overrideType == ANIM_FROM_STYLE && !isTask) {
a = loadCustomActivityTransition(animAttr, options, enter, transitionAnimation);
if (a == null) {
final TransitionInfo.AnimationOptions.CustomActivityTransition customTransition =
getCustomActivityTransition(animAttr, options);
if (customTransition != null) {
a = loadCustomActivityTransition(
customTransition, options, enter, transitionAnimation);
} else {
a = transitionAnimation
.loadAnimationAttr(options.getPackageName(), options.getAnimations(),
animAttr, translucent);
@@ -161,10 +165,8 @@ public class TransitionAnimationHelper {
return a;
}
static Animation loadCustomActivityTransition(int animAttr,
TransitionInfo.AnimationOptions options, boolean enter,
TransitionAnimation transitionAnimation) {
Animation a = null;
static TransitionInfo.AnimationOptions.CustomActivityTransition getCustomActivityTransition(
int animAttr, TransitionInfo.AnimationOptions options) {
boolean isOpen = false;
switch (animAttr) {
case R.styleable.WindowAnimation_activityOpenEnterAnimation:
@@ -178,17 +180,19 @@ public class TransitionAnimationHelper {
return null;
}
final TransitionInfo.AnimationOptions.CustomActivityTransition transitionAnim =
options.getCustomActivityTransition(isOpen);
if (transitionAnim != null) {
a = transitionAnimation.loadAppTransitionAnimation(options.getPackageName(),
enter ? transitionAnim.getCustomEnterResId()
: transitionAnim.getCustomExitResId());
if (a != null && transitionAnim.getCustomBackgroundColor() != 0) {
a.setBackdropColor(transitionAnim.getCustomBackgroundColor());
}
}
return options.getCustomActivityTransition(isOpen);
}
static Animation loadCustomActivityTransition(
@NonNull TransitionInfo.AnimationOptions.CustomActivityTransition transitionAnim,
TransitionInfo.AnimationOptions options, boolean enter,
TransitionAnimation transitionAnimation) {
final Animation a = transitionAnimation.loadAppTransitionAnimation(options.getPackageName(),
enter ? transitionAnim.getCustomEnterResId()
: transitionAnim.getCustomExitResId());
if (a != null && transitionAnim.getCustomBackgroundColor() != 0) {
a.setBackdropColor(transitionAnim.getCustomBackgroundColor());
}
return a;
}

40
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -888,8 +888,11 @@ public class AppTransition implements Dump {
} else {
int animAttr = mapOpenCloseTransitTypes(transit, enter);
if (animAttr != 0) {
a = loadCustomActivityAnimation(animAttr, enter, container);
if (a == null) {
final CustomAppTransition customAppTransition =
getCustomAppTransition(animAttr, container);
if (customAppTransition != null) {
a = loadCustomActivityAnimation(customAppTransition, enter, container);
} else {
if (canCustomizeAppTransition) {
a = loadAnimationAttr(lp, animAttr, transit);
} else {
@@ -911,7 +914,7 @@ public class AppTransition implements Dump {
return a;
}
Animation loadCustomActivityAnimation(int animAttr, boolean enter, WindowContainer container) {
CustomAppTransition getCustomAppTransition(int animAttr, WindowContainer container) {
ActivityRecord customAnimationSource = container.asActivityRecord();
if (customAnimationSource == null) {
return null;
@@ -927,31 +930,28 @@ public class AppTransition implements Dump {
return null;
}
}
final CustomAppTransition custom;
switch (animAttr) {
case WindowAnimation_activityOpenEnterAnimation:
case WindowAnimation_activityOpenExitAnimation:
custom = customAnimationSource.getCustomAnimation(true /* open */);
break;
return customAnimationSource.getCustomAnimation(true /* open */);
case WindowAnimation_activityCloseEnterAnimation:
case WindowAnimation_activityCloseExitAnimation:
custom = customAnimationSource.getCustomAnimation(false /* open */);
break;
default:
return null;
}
if (custom != null) {
final Animation a = mTransitionAnimation.loadAppTransitionAnimation(
customAnimationSource.packageName, enter
? custom.mEnterAnim : custom.mExitAnim);
if (a != null && custom.mBackgroundColor != 0) {
a.setBackdropColor(custom.mBackgroundColor);
a.setShowBackdrop(true);
}
return a;
return customAnimationSource.getCustomAnimation(false /* open */);
}
return null;
}
private Animation loadCustomActivityAnimation(@NonNull CustomAppTransition custom,
boolean enter, WindowContainer container) {
final ActivityRecord customAnimationSource = container.asActivityRecord();
final Animation a = mTransitionAnimation.loadAppTransitionAnimation(
customAnimationSource.packageName, enter
? custom.mEnterAnim : custom.mExitAnim);
if (a != null && custom.mBackgroundColor != 0) {
a.setBackdropColor(custom.mBackgroundColor);
a.setShowBackdrop(true);
}
return a;
}
int getAppRootTaskClipMode() {
return mNextAppTransitionRequests.contains(TRANSIT_RELAUNCH)