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

Commit 861733f7 authored by Sukesh Ram's avatar Sukesh Ram Committed by Android (Google) Code Review
Browse files

Merge "Remove Windowing Prototype 1 from Codebase" into main

parents 9804ad0b 3f2338a8

quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java

+1 −2
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ public class DesktopVisibilityController { 
     * Whether desktop mode is supported.

     */

    private boolean isDesktopModeSupported() {

        return SystemProperties.getBoolean("persist.wm.debug.desktop_mode", false)

                || SystemProperties.getBoolean("persist.wm.debug.desktop_mode_2", false);

        return SystemProperties.getBoolean("persist.wm.debug.desktop_mode_2", false);

    }



    /**

quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public final class KeyboardQuickSwitchController implements 
        DesktopVisibilityController desktopController =

                LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();

        final boolean onDesktop =

                DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED

                DesktopTaskView.DESKTOP_MODE_SUPPORTED

                        && desktopController != null

                        && desktopController.areFreeformTasksVisible();
@@ -136,7 +136,7 @@ public final class KeyboardQuickSwitchController implements 


        // Hide all desktop tasks and show them on the hidden tile

        int hiddenDesktopTasks = 0;

        if (DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED) {

        if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) {

            DesktopTask desktopTask = findDesktopTask(tasks);

            if (desktopTask != null) {

                hiddenDesktopTasks = desktopTask.tasks.size();

quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa 
    private void navigateHome() {

        TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY);



        if (DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED) {

        if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) {

            DesktopVisibilityController desktopVisibilityController =

                    LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();

            if (desktopVisibilityController != null) {

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME | STATE_CAPTURE_SCREENSHOT);

                // Notify the SysUI to use fade-in animation when entering PiP

                SystemUiProxy.INSTANCE.get(mContext).setPipAnimationTypeToAlpha();

                if (DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED) {

                if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) {

                    // Notify the SysUI to stash desktop apps if they are visible

                    DesktopVisibilityController desktopVisibilityController =

                            mActivityInterface.getDesktopVisibilityController();

quickstep/src/com/android/quickstep/RecentTasksList.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.quickstep;



import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.quickstep.views.DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED;

import static com.android.quickstep.views.DesktopTaskView.DESKTOP_MODE_SUPPORTED;

import static com.android.wm.shell.util.GroupedRecentTaskInfo.TYPE_FREEFORM;



import android.annotation.TargetApi;
@@ -270,7 +270,7 @@ public class RecentTasksList { 
        TaskLoadResult allTasks = new TaskLoadResult(requestId, loadKeysOnly, rawTasks.size());



        for (GroupedRecentTaskInfo rawTask : rawTasks) {

            if (DESKTOP_IS_PROTO2_ENABLED && rawTask.getType() == TYPE_FREEFORM) {

            if (DESKTOP_MODE_SUPPORTED && rawTask.getType() == TYPE_FREEFORM) {

                GroupTask desktopTask = createDesktopTask(rawTask);

                allTasks.add(desktopTask);

                continue;