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

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

Merge "Check for both proto flags for common logic" into tm-qpr-dev

parents ddc7ef2e 8f5b9dd8

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

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

     */

    private boolean isDesktopModeSupported() {

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

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

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

    }



    /**

quickstep/src/com/android/quickstep/TaskShortcutFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -303,7 +303,8 @@ public interface TaskShortcutFactory { 


        private boolean isAvailable(BaseDraggingActivity activity, int displayId) {

            return ActivityManagerWrapper.getInstance().supportsFreeformMultiWindow(activity)

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

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

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

        }

    };

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

+4 −3
Original line number Diff line number Diff line
@@ -59,9 +59,10 @@ import java.util.function.Consumer; 
// TODO(b/249371338): TaskView needs to be refactored to have better support for N tasks.

public class DesktopTaskView extends TaskView {



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

    public static final boolean DESKTOP_MODE_SUPPORTED = SystemProperties.getBoolean(

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

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

    public static final boolean DESKTOP_MODE_SUPPORTED =

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

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



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