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

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

Merge "Removed dead code around TRANSIT_TASK_IN_PLACE"

parents e860839c d196637f

core/java/android/app/IActivityTaskManager.aidl

+0 −1
Original line number Original line Diff line number Diff line
@@ -215,7 +215,6 @@ interface IActivityTaskManager { 




    void releaseSomeActivities(in IApplicationThread app);

    void releaseSomeActivities(in IApplicationThread app);

    Bitmap getTaskDescriptionIcon(in String filename, int userId);

    Bitmap getTaskDescriptionIcon(in String filename, int userId);

    void startInPlaceAnimationOnFrontMostApplication(in Bundle opts);

    void registerTaskStackListener(in ITaskStackListener listener);

    void registerTaskStackListener(in ITaskStackListener listener);

    void unregisterTaskStackListener(in ITaskStackListener listener);

    void unregisterTaskStackListener(in ITaskStackListener listener);

    void setTaskResizeable(int taskId, int resizeableMode);

    void setTaskResizeable(int taskId, int resizeableMode);

core/java/android/view/WindowManager.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -196,12 +196,6 @@ public interface WindowManager extends ViewManager { 
     */

     */

    int TRANSIT_TASK_OPEN_BEHIND = 16;

    int TRANSIT_TASK_OPEN_BEHIND = 16;





    /**

     * A window in a task is being animated in-place.

     * @hide

     */

    int TRANSIT_TASK_IN_PLACE = 17;



    /**

    /**

     * An activity is being relaunched (e.g. due to configuration change).

     * An activity is being relaunched (e.g. due to configuration change).

     * @hide

     * @hide
@@ -286,7 +280,6 @@ public interface WindowManager extends ViewManager { 
            TRANSIT_WALLPAPER_INTRA_OPEN,

            TRANSIT_WALLPAPER_INTRA_OPEN,

            TRANSIT_WALLPAPER_INTRA_CLOSE,

            TRANSIT_WALLPAPER_INTRA_CLOSE,

            TRANSIT_TASK_OPEN_BEHIND,

            TRANSIT_TASK_OPEN_BEHIND,

            TRANSIT_TASK_IN_PLACE,

            TRANSIT_ACTIVITY_RELAUNCH,

            TRANSIT_ACTIVITY_RELAUNCH,

            TRANSIT_DOCK_TASK_FROM_RECENTS,

            TRANSIT_DOCK_TASK_FROM_RECENTS,

            TRANSIT_KEYGUARD_GOING_AWAY,

            TRANSIT_KEYGUARD_GOING_AWAY,

packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,6 @@ public class WindowManagerWrapper { 
    public static final int TRANSIT_WALLPAPER_INTRA_CLOSE =

    public static final int TRANSIT_WALLPAPER_INTRA_CLOSE =

            WindowManager.TRANSIT_WALLPAPER_INTRA_CLOSE;

            WindowManager.TRANSIT_WALLPAPER_INTRA_CLOSE;

    public static final int TRANSIT_TASK_OPEN_BEHIND = WindowManager.TRANSIT_TASK_OPEN_BEHIND;

    public static final int TRANSIT_TASK_OPEN_BEHIND = WindowManager.TRANSIT_TASK_OPEN_BEHIND;

    public static final int TRANSIT_TASK_IN_PLACE = WindowManager.TRANSIT_TASK_IN_PLACE;

    public static final int TRANSIT_ACTIVITY_RELAUNCH = WindowManager.TRANSIT_ACTIVITY_RELAUNCH;

    public static final int TRANSIT_ACTIVITY_RELAUNCH = WindowManager.TRANSIT_ACTIVITY_RELAUNCH;

    public static final int TRANSIT_DOCK_TASK_FROM_RECENTS =

    public static final int TRANSIT_DOCK_TASK_FROM_RECENTS =

            WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;

            WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS;

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

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

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.INVALID_DISPLAY;

import static android.view.Display.INVALID_DISPLAY;

import static android.view.WindowManager.TRANSIT_NONE;

import static android.view.WindowManager.TRANSIT_NONE;

import static android.view.WindowManager.TRANSIT_TASK_IN_PLACE;





import static com.android.server.am.ActivityManagerService.ANR_TRACE_DIR;

import static com.android.server.am.ActivityManagerService.ANR_TRACE_DIR;

import static com.android.server.am.ActivityManagerService.MY_PID;

import static com.android.server.am.ActivityManagerService.MY_PID;
@@ -3320,29 +3319,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        return mRecentTasks.getTaskDescriptionIcon(filePath);

        return mRecentTasks.getTaskDescriptionIcon(filePath);

    }

    }





    @Override

    public void startInPlaceAnimationOnFrontMostApplication(Bundle opts) {

        final SafeActivityOptions safeOptions = SafeActivityOptions.fromBundle(opts);

        final ActivityOptions activityOptions = safeOptions != null

                ? safeOptions.getOptions(mStackSupervisor)

                : null;

        if (activityOptions == null

                || activityOptions.getAnimationType() != ActivityOptions.ANIM_CUSTOM_IN_PLACE

                || activityOptions.getCustomInPlaceResId() == 0) {

            throw new IllegalArgumentException("Expected in-place ActivityOption " +

                    "with valid animation");

        }

        // Get top display of front most application.

        final ActivityStack focusedStack = getTopDisplayFocusedStack();

        if (focusedStack != null) {

            final DisplayContent dc = focusedStack.getDisplay().mDisplayContent;

            dc.prepareAppTransition(TRANSIT_TASK_IN_PLACE, false);

            dc.mAppTransition.overrideInPlaceAppTransition(activityOptions.getPackageName(),

                    activityOptions.getCustomInPlaceResId());

            dc.executeAppTransition();

        }

    }



    @Override

    @Override

    public void removeStack(int stackId) {

    public void removeStack(int stackId) {

        enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "removeStack()");

        enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "removeStack()");

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ import static android.view.WindowManager.TRANSIT_NONE; 
import static android.view.WindowManager.TRANSIT_SHOW_SINGLE_TASK_DISPLAY;

import static android.view.WindowManager.TRANSIT_SHOW_SINGLE_TASK_DISPLAY;

import static android.view.WindowManager.TRANSIT_TASK_CHANGE_WINDOWING_MODE;

import static android.view.WindowManager.TRANSIT_TASK_CHANGE_WINDOWING_MODE;

import static android.view.WindowManager.TRANSIT_TASK_CLOSE;

import static android.view.WindowManager.TRANSIT_TASK_CLOSE;

import static android.view.WindowManager.TRANSIT_TASK_IN_PLACE;

import static android.view.WindowManager.TRANSIT_TASK_OPEN;

import static android.view.WindowManager.TRANSIT_TASK_OPEN;

import static android.view.WindowManager.TRANSIT_TASK_OPEN_BEHIND;

import static android.view.WindowManager.TRANSIT_TASK_OPEN_BEHIND;

import static android.view.WindowManager.TRANSIT_TASK_TO_BACK;

import static android.view.WindowManager.TRANSIT_TASK_TO_BACK;
@@ -2257,8 +2256,7 @@ public class AppTransition implements Dump { 
    static boolean isTaskTransit(int transit) {

    static boolean isTaskTransit(int transit) {

        return isTaskOpenTransit(transit)

        return isTaskOpenTransit(transit)

                || transit == TRANSIT_TASK_CLOSE

                || transit == TRANSIT_TASK_CLOSE

                || transit == TRANSIT_TASK_TO_BACK

                || transit == TRANSIT_TASK_TO_BACK;

                || transit == TRANSIT_TASK_IN_PLACE;

    }

    }





    private static  boolean isTaskOpenTransit(int transit) {

    private static  boolean isTaskOpenTransit(int transit) {