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

Commit 983bc5f9 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Clean up shell transition check in WM shell" into main

parents 9bbcffbe b434a8eb

libs/WindowManager/Shell/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
         TODO(b/238217847): This config is temporary until we refactor the base WMComponent. -->

    <bool name="config_registerShellTaskOrganizerOnInit">true</bool>



    <!-- Determines whether to register the shell transitions on init.

         TODO(b/238217847): This config is temporary until we refactor the base WMComponent. -->

    <bool name="config_registerShellTransitionsOnInit">true</bool>



    <!-- Animation duration for PIP when entering. -->

    <integer name="config_pipEnterAnimationDuration">425</integer>

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+0 −5
Original line number Diff line number Diff line
@@ -3582,10 +3582,5 @@ public class BubbleController implements ConfigurationChangeListener, 
        public void setTaskBounds(TaskViewTaskController taskView, Rect boundsOnScreen) {

            mBaseTransitions.setTaskBounds(taskView, boundsOnScreen);

        }



        @Override

        public boolean isUsingShellTransitions() {

            return mBaseTransitions.isUsingShellTransitions();

        }

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+0 −4
Original line number Diff line number Diff line
@@ -797,10 +797,6 @@ public abstract class WMShellBaseModule { 
            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            HomeTransitionObserver homeTransitionObserver,

            FocusTransitionObserver focusTransitionObserver) {

        if (!context.getResources().getBoolean(R.bool.config_registerShellTransitionsOnInit)) {

            // TODO(b/238217847): Force override shell init if registration is disabled

            shellInit = new ShellInit(mainExecutor);

        }

        return new Transitions(context, shellInit, shellCommandHandler, shellController, organizer,

                pool, displayController, displayInsetsController, mainExecutor, mainHandler,

                animExecutor, rootTaskDisplayAreaOrganizer, homeTransitionObserver,

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskView.java

+0 −14
Original line number Diff line number Diff line
@@ -163,20 +163,6 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback, 
        mTaskViewController.moveTaskViewToFullscreen(mTaskViewTaskController);

    }



    @Override

    public void onTaskAppeared(ActivityManager.RunningTaskInfo taskInfo, SurfaceControl leash) {

        if (mTaskViewController.isUsingShellTransitions()) {

            // No need for additional work as it is already taken care of during

            // prepareOpenAnimation().

            return;

        }

        onLocationChanged();

        if (taskInfo.taskDescription != null) {

            final int bgColor = taskInfo.taskDescription.getBackgroundColor();

            runOnViewThread(() -> setResizeBackgroundColor(bgColor));

        }

    }



    @Override

    public void onTaskInfoChanged(ActivityManager.RunningTaskInfo taskInfo) {

        if (taskInfo.taskDescription != null) {

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewController.java

+0 −3
Original line number Diff line number Diff line
@@ -127,7 +127,4 @@ public interface TaskViewController { 
     * @param boundsOnScreen the on screen bounds of the surface view.

     */

    void setTaskBounds(TaskViewTaskController taskView, Rect boundsOnScreen);



    /** Whether shell-transitions are currently enabled. */

    boolean isUsingShellTransitions();

}