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

Commit 30ce5da1 authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

Merge changes Ia2f99fa3,I4320b04d 

* changes:
  Replace old app transition type to new transition type (3/N)
  Replace old app transition type to new transition type (2/N)
parents f474b783 c4ab2cca

core/java/android/view/WindowManager.java

+9 −1
Original line number Diff line number Diff line
@@ -409,6 +409,13 @@ public interface WindowManager extends ViewManager { 
     */

    int TRANSIT_FLAG_APP_CRASHED = 0x10;



    /**

     * Transition flag: A window in a new task is being opened behind an existing one in another

     * activity's task.

     * @hide

     */

    int TRANSIT_FLAG_OPEN_BEHIND = 0x20;



    /**

     * @hide

     */
@@ -417,7 +424,8 @@ public interface WindowManager extends ViewManager { 
            TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION,

            TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER,

            TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION,

            TRANSIT_FLAG_APP_CRASHED

            TRANSIT_FLAG_APP_CRASHED,

            TRANSIT_FLAG_OPEN_BEHIND

    })

    @Retention(RetentionPolicy.SOURCE)

    @interface TransitionFlags {}

data/etc/services.core.protolog.json

+24 −36
Original line number Diff line number Diff line
@@ -241,12 +241,6 @@ 
      "group": "WM_DEBUG_STATES",

      "at": "com\/android\/server\/wm\/Task.java"

    },

    "-1847087163": {

      "message": "TRANSIT_TASK_OPEN_BEHIND,  adding %s to mOpeningApps",

      "level": "DEBUG",

      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "-1844540996": {

      "message": "  Initial targets: %s",

      "level": "VERBOSE",
@@ -271,6 +265,12 @@ 
      "group": "WM_DEBUG_CONFIGURATION",

      "at": "com\/android\/server\/wm\/ActivityTaskManagerService.java"

    },

    "-1800899273": {

      "message": "applyAnimation: anim=%s transit=%s Callers=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",

      "at": "com\/android\/server\/wm\/AppTransition.java"

    },

    "-1792633344": {

      "message": "Register task organizer=%s uid=%d",

      "level": "VERBOSE",
@@ -913,12 +913,6 @@ 
      "group": "WM_DEBUG_FOCUS",

      "at": "com\/android\/server\/wm\/WindowState.java"

    },

    "-1044506655": {

      "message": "New transit away from wallpaper: %s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/AppTransitionController.java"

    },

    "-1042574499": {

      "message": "Attempted to add Accessibility overlay window with unknown token %s.  Aborting.",

      "level": "WARN",
@@ -985,12 +979,6 @@ 
      "group": "WM_DEBUG_CONFIGURATION",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "-928291778": {

      "message": "applyAnimation: anim=%s nextAppTransition=%d transit=%s Callers=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",

      "at": "com\/android\/server\/wm\/AppTransition.java"

    },

    "-927199900": {

      "message": "Updating global configuration to: %s",

      "level": "INFO",
@@ -1117,12 +1105,6 @@ 
      "group": "WM_DEBUG_CONFIGURATION",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "-793346159": {

      "message": "New transit into wallpaper: %s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/AppTransitionController.java"

    },

    "-784959154": {

      "message": "Attempted to add private presentation window to a non-private display.  Aborting.",

      "level": "WARN",
@@ -1195,6 +1177,12 @@ 
      "group": "WM_DEBUG_WINDOW_TRANSITIONS",

      "at": "com\/android\/server\/wm\/Transition.java"

    },

    "-701167286": {

      "message": "applyAnimation: transit=%s, enter=%b, wc=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",

      "at": "com\/android\/server\/wm\/WindowContainer.java"

    },

    "-694710814": {

      "message": "Pausing rotation during drag",

      "level": "DEBUG",
@@ -1597,6 +1585,12 @@ 
      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "-240296576": {

      "message": "handleAppTransitionReady: displayId=%d appTransition={%s} openingApps=[%s] closingApps=[%s] transit=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/AppTransitionController.java"

    },

    "-235225312": {

      "message": "Skipping config check for initializing activity: %s",

      "level": "VERBOSE",
@@ -1657,12 +1651,6 @@ 
      "group": "WM_ERROR",

      "at": "com\/android\/server\/wm\/WindowManagerService.java"

    },

    "-129722369": {

      "message": "New transit: %s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/AppTransitionController.java"

    },

    "-118786523": {

      "message": "Resume failed; resetting state to %s: %s",

      "level": "VERBOSE",
@@ -3289,6 +3277,12 @@ 
      "group": "WM_DEBUG_STATES",

      "at": "com\/android\/server\/wm\/RootWindowContainer.java"

    },

    "1810019902": {

      "message": "TRANSIT_FLAG_OPEN_BEHIND,  adding %s to mOpeningApps",

      "level": "DEBUG",

      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "1822843721": {

      "message": "Aborted starting %s: startingData=%s",

      "level": "VERBOSE",
@@ -3433,12 +3427,6 @@ 
      "group": "WM_DEBUG_CONFIGURATION",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "2016061474": {

      "message": "Prepare app transition: transit=%s %s alwaysKeepCurrent=%b displayId=%d Callers=%s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/AppTransition.java"

    },

    "2018454757": {

      "message": "WS.removeImmediately: %s Already removed...",

      "level": "VERBOSE",

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −7
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ import com.android.server.policy.keyguard.KeyguardStateMonitor.StateCallback; 
import com.android.server.statusbar.StatusBarManagerInternal;

import com.android.server.vr.VrManagerInternal;

import com.android.server.wm.ActivityTaskManagerInternal;

import com.android.server.wm.AppTransition;

import com.android.server.wm.DisplayPolicy;

import com.android.server.wm.DisplayRotation;

import com.android.server.wm.WindowManagerInternal;
@@ -1959,14 +1958,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


        mWindowManagerInternal.registerAppTransitionListener(new AppTransitionListener() {

            @Override

            public int onAppTransitionStartingLocked(int transit, long duration,

            public int onAppTransitionStartingLocked(boolean keyguardGoingAway, long duration,

                    long statusBarAnimationStartTime, long statusBarAnimationDuration) {

                return handleStartTransitionForKeyguardLw(transit, duration);

                return handleStartTransitionForKeyguardLw(keyguardGoingAway, duration);

            }



            @Override

            public void onAppTransitionCancelledLocked(int transit) {

                handleStartTransitionForKeyguardLw(transit, 0 /* duration */);

            public void onAppTransitionCancelledLocked(boolean keyguardGoingAway) {

                handleStartTransitionForKeyguardLw(keyguardGoingAway, 0 /* duration */);

            }

        });

        mKeyguardDelegate = new KeyguardServiceDelegate(mContext,
@@ -3194,7 +3193,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

    }



    private int handleStartTransitionForKeyguardLw(int transit, long duration) {

    private int handleStartTransitionForKeyguardLw(boolean keyguardGoingAway, long duration) {

        if (mKeyguardOccludedChanged) {

            if (DEBUG_KEYGUARD) Slog.d(TAG, "transition/occluded changed occluded="

                    + mPendingKeyguardOccluded);
@@ -3203,7 +3202,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                return FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_WALLPAPER;

            }

        }

        if (AppTransition.isKeyguardGoingAwayTransit(transit)) {

        if (keyguardGoingAway) {

            if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation");

            startKeyguardExitAnimation(SystemClock.uptimeMillis(), duration);

        }

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

+6 −8
Original line number Diff line number Diff line
@@ -103,9 +103,9 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; 
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;

import static android.view.WindowManager.TRANSIT_CLOSE;

import static android.view.WindowManager.TRANSIT_FLAG_OPEN_BEHIND;

import static android.view.WindowManager.TRANSIT_OLD_ACTIVITY_CLOSE;

import static android.view.WindowManager.TRANSIT_OLD_TASK_CLOSE;

import static android.view.WindowManager.TRANSIT_OLD_TASK_OPEN_BEHIND;

import static android.view.WindowManager.TRANSIT_OLD_UNSET;

import static android.view.WindowManager.TransitionOldType;
@@ -150,7 +150,6 @@ import static com.android.server.wm.ActivityRecordProto.VISIBLE; 
import static com.android.server.wm.ActivityRecordProto.VISIBLE_REQUESTED;

import static com.android.server.wm.ActivityRecordProto.VISIBLE_SET_FROM_TRANSFERRED_STARTING_WINDOW;

import static com.android.server.wm.ActivityRecordProto.WINDOW_TOKEN;

import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_APP;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RESULTS;
@@ -177,6 +176,7 @@ import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_F 
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_NONE;

import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE;

import static com.android.server.wm.ActivityTaskManagerService.getInputDispatchingTimeoutMillisLocked;

import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;

import static com.android.server.wm.IdentifierProto.HASH_CODE;

import static com.android.server.wm.IdentifierProto.TITLE;

import static com.android.server.wm.IdentifierProto.USER_ID;
@@ -2609,7 +2609,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                if (DEBUG_VISIBILITY || DEBUG_TRANSITION) {

                    Slog.v(TAG_TRANSITION, "Prepare close transition: finishing " + this);

                }

                mDisplayContent.prepareAppTransitionOld(transit, false);

                mDisplayContent.prepareAppTransition(TRANSIT_CLOSE);



                // When finishing the activity preemptively take the snapshot before the app window
@@ -2693,7 +2692,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


    private void prepareActivityHideTransitionAnimation(@TransitionOldType int transit) {

        final DisplayContent dc = mDisplayContent;

        dc.prepareAppTransitionOld(transit, false);

        dc.prepareAppTransition(TRANSIT_CLOSE);

        setVisibility(false);

        dc.executeAppTransition();
@@ -4274,14 +4272,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                displayContent.mClosingApps.add(this);

                mEnteringAnimation = false;

            }

            if (appTransition.getAppTransitionOld() == TRANSIT_OLD_TASK_OPEN_BEHIND) {

            if ((appTransition.getTransitFlags() & TRANSIT_FLAG_OPEN_BEHIND) != 0) {

                // We're launchingBehind, add the launching activity to mOpeningApps.

                final WindowState win = getDisplayContent().findFocusedWindow();

                if (win != null) {

                    final ActivityRecord focusedActivity = win.mActivityRecord;

                    if (focusedActivity != null) {

                        ProtoLog.d(WM_DEBUG_APP_TRANSITIONS,

                                "TRANSIT_TASK_OPEN_BEHIND,  adding %s to mOpeningApps",

                                "TRANSIT_FLAG_OPEN_BEHIND,  adding %s to mOpeningApps",

                                focusedActivity);



                        // Force animation to be loaded.
@@ -4297,7 +4295,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    }



    @Override

    boolean applyAnimation(LayoutParams lp, int transit, boolean enter,

    boolean applyAnimation(LayoutParams lp, @TransitionOldType int transit, boolean enter,

            boolean isVoiceInteraction, @Nullable ArrayList<WindowContainer> sources) {

        if (mUseTransferredAnimation) {

            return false;
@@ -6312,7 +6310,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        mThumbnail = null;

    }



    public int getTransit() {

    public @TransitionOldType int getTransit() {

        return mTransit;

    }

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

+4 −7
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import static android.text.format.DateUtils.MINUTE_IN_MILLIS; 
import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.INVALID_DISPLAY;

import static android.view.WindowManager.TRANSIT_NONE;

import static android.view.WindowManager.TRANSIT_OLD_NONE;



import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_CONFIGURATION;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_FOCUS;
@@ -95,10 +94,6 @@ import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.Scr 
import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.ScreenCompatPackage.PACKAGE;

import static com.android.server.am.EventLogTags.writeBootProgressEnableScreen;

import static com.android.server.am.EventLogTags.writeConfigurationChanged;

import static com.android.server.wm.ActivityTaskSupervisor.DEFER_RESUME;

import static com.android.server.wm.ActivityTaskSupervisor.ON_TOP;

import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;

import static com.android.server.wm.ActivityTaskSupervisor.REMOVE_FROM_RECENTS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_ALL;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_VISIBILITY;
@@ -117,6 +112,10 @@ import static com.android.server.wm.ActivityTaskManagerInternal.ASSIST_KEY_RECEI 
import static com.android.server.wm.ActivityTaskManagerInternal.ASSIST_KEY_STRUCTURE;

import static com.android.server.wm.ActivityTaskManagerService.H.REPORT_TIME_TRACKER_MSG;

import static com.android.server.wm.ActivityTaskManagerService.UiHandler.DISMISS_DIALOG_UI_MSG;

import static com.android.server.wm.ActivityTaskSupervisor.DEFER_RESUME;

import static com.android.server.wm.ActivityTaskSupervisor.ON_TOP;

import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;

import static com.android.server.wm.ActivityTaskSupervisor.REMOVE_FROM_RECENTS;

import static com.android.server.wm.LockTaskController.LOCK_TASK_AUTH_DONT_LOCK;

import static com.android.server.wm.RecentsAnimationController.REORDER_KEEP_IN_PLACE;

import static com.android.server.wm.RecentsAnimationController.REORDER_MOVE_TO_ORIGINAL_POSITION;
@@ -164,7 +163,6 @@ import android.app.assist.AssistStructure; 
import android.app.servertransaction.ClientTransaction;

import android.app.servertransaction.EnterPipRequestedItem;

import android.app.usage.UsageStatsManagerInternal;

import android.compat.annotation.ChangeId;

import android.content.ActivityNotFoundException;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -6248,7 +6246,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                }

                final boolean wasTransitionSet = dc.mAppTransition.isTransitionSet();

                if (!wasTransitionSet) {

                    dc.prepareAppTransitionOld(TRANSIT_OLD_NONE, false /* alwaysKeepCurrent */);

                    dc.prepareAppTransition(TRANSIT_NONE);

                }

                mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);