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

Commit 4d847084 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Consolidate the starting window leash relative position." into tm-dev am: ad724202 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17157588

Change-Id: I5f1d199727694ef4d1b3749fc4bc5058f9a0448b
parents d852b051 ad724202

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.app.ActivityManager.RunningTaskInfo; 
import android.app.WindowConfiguration;

import android.app.WindowConfiguration;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.ParceledListSlice;

import android.content.pm.ParceledListSlice;

import android.graphics.Rect;

import android.os.Binder;

import android.os.Binder;

import android.os.IBinder;

import android.os.IBinder;

import android.os.Parcel;

import android.os.Parcel;
@@ -474,10 +475,12 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
        }

        }

    }

    }





    static SurfaceControl applyStartingWindowAnimation(WindowContainer window) {

    static SurfaceControl applyStartingWindowAnimation(WindowState window) {

        final SurfaceControl.Transaction t = window.getPendingTransaction();

        final Rect mainFrame = window.getRelativeFrame();

        final StartingWindowAnimationAdaptor adaptor = new StartingWindowAnimationAdaptor();

        final StartingWindowAnimationAdaptor adaptor = new StartingWindowAnimationAdaptor();

        window.startAnimation(window.getPendingTransaction(), adaptor, false,

        window.startAnimation(t, adaptor, false, ANIMATION_TYPE_STARTING_REVEAL);

                ANIMATION_TYPE_STARTING_REVEAL);

        t.setPosition(adaptor.mAnimationLeash, mainFrame.left, mainFrame.top);

        return adaptor.mAnimationLeash;

        return adaptor.mAnimationLeash;

    }

    }
@@ -530,8 +533,6 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
                    final SurfaceControl.Transaction t = mainWindow.getPendingTransaction();

                    final SurfaceControl.Transaction t = mainWindow.getPendingTransaction();

                    removalInfo.windowAnimationLeash = applyStartingWindowAnimation(mainWindow);

                    removalInfo.windowAnimationLeash = applyStartingWindowAnimation(mainWindow);

                    removalInfo.mainFrame = mainWindow.getRelativeFrame();

                    removalInfo.mainFrame = mainWindow.getRelativeFrame();

                    t.setPosition(removalInfo.windowAnimationLeash,

                            removalInfo.mainFrame.left, removalInfo.mainFrame.top);

                }

                }

            }

            }

        }

        }