Merge "Do not show animation background with wallpaper transition" into tm-dev
This commit is contained in:
@@ -417,7 +417,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler {
|
|||||||
|| type == TRANSIT_TO_FRONT
|
|| type == TRANSIT_TO_FRONT
|
||||||
|| type == TRANSIT_TO_BACK;
|
|| type == TRANSIT_TO_BACK;
|
||||||
final boolean isTranslucent = (change.getFlags() & FLAG_TRANSLUCENT) != 0;
|
final boolean isTranslucent = (change.getFlags() & FLAG_TRANSLUCENT) != 0;
|
||||||
if (isOpenOrCloseTransition && !isTranslucent) {
|
if (isOpenOrCloseTransition && !isTranslucent
|
||||||
|
&& wallpaperTransit == WALLPAPER_TRANSITION_NONE) {
|
||||||
// Use the overview background as the background for the animation
|
// Use the overview background as the background for the animation
|
||||||
final Context uiContext = ActivityThread.currentActivityThread()
|
final Context uiContext = ActivityThread.currentActivityThread()
|
||||||
.getSystemUiContext();
|
.getSystemUiContext();
|
||||||
|
|||||||
Reference in New Issue
Block a user