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

Merge "Override animation background with app override color" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-05 16:34:29 +00:00
committed by Android (Google) Code Review
parent f10f6630ea 166d53bdb9
commit 2ff8b7b00e
2 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/wm/Transition.java
View File

@@ -1731,13 +1731,26 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
} }
if (activityRecord != null || (taskFragment != null && taskFragment.isEmbedded())) { if (activityRecord != null || (taskFragment != null && taskFragment.isEmbedded())) {
// Set background color to Task theme color for activity and embedded TaskFragment final int backgroundColor;
// in case we want to show background during the animation. final TaskFragment organizedTf = activityRecord != null
? activityRecord.getOrganizedTaskFragment()
: taskFragment.getOrganizedTaskFragment();
if (organizedTf != null && organizedTf.getAnimationParams()
.getAnimationBackgroundColor() != 0) {
// This window is embedded and has an animation background color set on the
// TaskFragment. Pass this color with this window, so the handler can use it as
// the animation background color if needed,
backgroundColor = organizedTf.getAnimationParams()
.getAnimationBackgroundColor();
} else {
// Set background color to Task theme color for activity and embedded
// TaskFragment in case we want to show background during the animation.
final Task parentTask = activityRecord != null final Task parentTask = activityRecord != null
? activityRecord.getTask() ? activityRecord.getTask()
: taskFragment.getTask(); : taskFragment.getTask();
final int backgroundColor = ColorUtils.setAlphaComponent( backgroundColor = ColorUtils.setAlphaComponent(
parentTask.getTaskDescription().getBackgroundColor(), 255); parentTask.getTaskDescription().getBackgroundColor(), 255);
}
change.setBackgroundColor(backgroundColor); change.setBackgroundColor(backgroundColor);
} }

12
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -3144,6 +3144,17 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
// If available use the background color provided through getBackgroundColor // If available use the background color provided through getBackgroundColor
// which if set originates from a call to overridePendingAppTransition. // which if set originates from a call to overridePendingAppTransition.
backgroundColorForTransition = adapter.getBackgroundColor(); backgroundColorForTransition = adapter.getBackgroundColor();
} else {
final TaskFragment organizedTf = activityRecord != null
? activityRecord.getOrganizedTaskFragment()
: taskFragment.getOrganizedTaskFragment();
if (organizedTf != null && organizedTf.getAnimationParams()
.getAnimationBackgroundColor() != 0) {
// This window is embedded and has an animation background color set on the
// TaskFragment. Pass this color with this window, so the handler can use it
// as the animation background color if needed,
backgroundColorForTransition = organizedTf.getAnimationParams()
.getAnimationBackgroundColor();
} else { } else {
// Otherwise default to the window's background color if provided through // Otherwise default to the window's background color if provided through
// the theme as the background color for the animation - the top most window // the theme as the background color for the animation - the top most window
@@ -3154,6 +3165,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
backgroundColorForTransition = ColorUtils.setAlphaComponent( backgroundColorForTransition = ColorUtils.setAlphaComponent(
parentTask.getTaskDescription().getBackgroundColor(), 255); parentTask.getTaskDescription().getBackgroundColor(), 255);
} }
}
animationRunnerBuilder.setTaskBackgroundColor(backgroundColorForTransition); animationRunnerBuilder.setTaskBackgroundColor(backgroundColorForTransition);
} }