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

Commit a9a99a47 authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Remove desktop tile from proto 1 of desktop windowing" into tm-qpr-dev

parents a3e61240 f32f5179

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

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

package com.android.quickstep;





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

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

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

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

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

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





import android.annotation.TargetApi;

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

        TaskLoadResult allTasks = new TaskLoadResult(requestId, loadKeysOnly, rawTasks.size());





        for (GroupedRecentTaskInfo rawTask : rawTasks) {

        for (GroupedRecentTaskInfo rawTask : rawTasks) {

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

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

                GroupTask desktopTask = createDesktopTask(rawTask);

                GroupTask desktopTask = createDesktopTask(rawTask);

                allTasks.add(desktopTask);

                allTasks.add(desktopTask);

                continue;

                continue;

quickstep/src/com/android/quickstep/views/DesktopTaskView.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -61,14 +61,17 @@ import java.util.function.Consumer; 
// TODO(b/249371338): TaskView needs to be refactored to have better support for N tasks.

// TODO(b/249371338): TaskView needs to be refactored to have better support for N tasks.

public class DesktopTaskView extends TaskView {

public class DesktopTaskView extends TaskView {





    /** Flag to indicate whether desktop windowing proto 1 is enabled */

    private static final boolean DESKTOP_IS_PROTO1_ENABLED = SystemProperties.getBoolean(

            "persist.wm.debug.desktop_mode", false);



    /** Flag to indicate whether desktop windowing proto 2 is enabled */

    /** Flag to indicate whether desktop windowing proto 2 is enabled */

    public static final boolean DESKTOP_IS_PROTO2_ENABLED = SystemProperties.getBoolean(

    public static final boolean DESKTOP_IS_PROTO2_ENABLED = SystemProperties.getBoolean(

            "persist.wm.debug.desktop_mode_2", false);

            "persist.wm.debug.desktop_mode_2", false);





    /** Flags to indicate whether desktop mode is available on the device */

    /** Flags to indicate whether desktop mode is available on the device */

    public static final boolean DESKTOP_MODE_SUPPORTED =

    public static final boolean DESKTOP_MODE_SUPPORTED =

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

            DESKTOP_IS_PROTO1_ENABLED || DESKTOP_IS_PROTO2_ENABLED;

                    || DESKTOP_IS_PROTO2_ENABLED;





    private static final String TAG = DesktopTaskView.class.getSimpleName();

    private static final String TAG = DesktopTaskView.class.getSimpleName();