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

Commit 65794ef7 authored by Alina Zaidi's avatar Alina Zaidi
Browse files

[Dev options][Wallpaper flag] Update all usage of enableDesktopWindowingWallpaperActivity 

flag to use DesktopModeFlags

Test: Current tests pass
Bug: 348193756
Flag: com.android.window.flags.show_desktop_windowing_dev_option
Change-Id: Ib1b1b01f6a94b4d9c49019a31d0e2269246c301b
parent 6bf1a01f

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

+6 −7
Original line number Diff line number Diff line
@@ -19,10 +19,9 @@ import static android.view.View.VISIBLE; 


import static com.android.launcher3.LauncherState.BACKGROUND_APP;

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

import static com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY;



import android.os.Debug;

import android.os.SystemProperties;

import android.util.Log;

import android.view.View;
@@ -145,7 +144,7 @@ public class DesktopVisibilityController { 
                notifyDesktopVisibilityListeners(areDesktopTasksVisibleNow);

            }



            if (!enableDesktopWindowingWallpaperActivity() && wasVisible != isVisible) {

            if (!WALLPAPER_ACTIVITY.isEnabled(mLauncher) && wasVisible != isVisible) {

                // TODO: b/333533253 - Remove after flag rollout

                if (mVisibleDesktopTasksCount > 0) {

                    setLauncherViewsVisibility(View.INVISIBLE);
@@ -189,7 +188,7 @@ public class DesktopVisibilityController { 
                notifyDesktopVisibilityListeners(areDesktopTasksVisibleNow);

            }



            if (enableDesktopWindowingWallpaperActivity()) {

            if (WALLPAPER_ACTIVITY.isEnabled(mLauncher)) {

                return;

            }

            // TODO: b/333533253 - Clean up after flag rollout
@@ -289,7 +288,7 @@ public class DesktopVisibilityController { 
     * TODO: b/333533253 - Remove after flag rollout

     */

    private void setLauncherViewsVisibility(int visibility) {

        if (enableDesktopWindowingWallpaperActivity()) {

        if (WALLPAPER_ACTIVITY.isEnabled(mLauncher)) {

            return;

        }

        if (DEBUG) {
@@ -314,7 +313,7 @@ public class DesktopVisibilityController { 
     * TODO: b/333533253 - Remove after flag rollout

     */

    private void markLauncherPaused() {

        if (enableDesktopWindowingWallpaperActivity()) {

        if (WALLPAPER_ACTIVITY.isEnabled(mLauncher)) {

            return;

        }

        if (DEBUG) {
@@ -331,7 +330,7 @@ public class DesktopVisibilityController { 
     * TODO: b/333533253 - Remove after flag rollout

     */

    private void markLauncherResumed() {

        if (enableDesktopWindowingWallpaperActivity()) {

        if (WALLPAPER_ACTIVITY.isEnabled(mLauncher)) {

            return;

        }

        if (DEBUG) {

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

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import static com.android.launcher3.taskbar.TaskbarEduTooltipControllerKt.TOOLTI 
import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_VISIBLE;

import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IGNORE_IN_APP;

import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

import static com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY;



import android.animation.Animator;

import android.animation.AnimatorSet;
@@ -214,7 +214,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 


        DesktopVisibilityController desktopController =

                LauncherActivityInterface.INSTANCE.getDesktopVisibilityController();

        if (!enableDesktopWindowingWallpaperActivity()

        if (!WALLPAPER_ACTIVITY.isEnabled(mLauncher)

                && desktopController != null

                && desktopController.areDesktopTasksVisible()) {

            // TODO: b/333533253 - Remove after flag rollout

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent 
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.QUICK_SWITCH_FROM_HOME_FALLBACK;

import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback;

import static com.android.quickstep.util.SplitAnimationTimings.TABLET_HOME_TO_SPLIT;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;

import static com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity;

import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE;
@@ -1004,7 +1004,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer 


    @Override

    public void setResumed() {

        if (!enableDesktopWindowingWallpaperActivity()

        if (!WALLPAPER_ACTIVITY.isEnabled(this)

                && mDesktopVisibilityController != null

                && mDesktopVisibilityController.areDesktopTasksVisible()

                && !mDesktopVisibilityController.isRecentsGestureInProgress()) {

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

+4 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent 
import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -1274,7 +1275,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
                ? mRecentsView.getCurrentPageTaskView() : null;



        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

                && !(Flags.enableDesktopWindowingWallpaperActivity()

                && !(WALLPAPER_ACTIVITY.isEnabled(mContext)

                && Flags.enableDesktopWindowingQuickSwitch())) {

            if ((nextPageTaskView instanceof DesktopTaskView

                    || currentPageTaskView instanceof DesktopTaskView)
@@ -1447,7 +1448,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
        };



        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

                && !(Flags.enableDesktopWindowingWallpaperActivity()

                && !(WALLPAPER_ACTIVITY.isEnabled(mContext)

                && Flags.enableDesktopWindowingQuickSwitch())) {

            if (mRecentsView != null && (mRecentsView.getCurrentPageTaskView() != null

                    && !(mRecentsView.getCurrentPageTaskView() instanceof DesktopTaskView))) {
@@ -2295,7 +2296,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
        });



        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

                && !(Flags.enableDesktopWindowingWallpaperActivity()

                && !(WALLPAPER_ACTIVITY.isEnabled(mContext)

                        && Flags.enableDesktopWindowingQuickSwitch())) {

            if (mRecentsView.getNextPageTaskView() instanceof DesktopTaskView

                    || mRecentsView.getCurrentPageTaskView() instanceof DesktopTaskView) {

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

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK; 
import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;

import static com.android.launcher3.LauncherState.SPRING_LOADED;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SPLIT_SELECTION_EXIT_HOME;

import static com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY;



import android.annotation.TargetApi;

import android.content.Context;
@@ -268,7 +268,7 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher 
        super.onGestureAnimationStart(runningTasks, rotationTouchHelper);

        DesktopVisibilityController desktopVisibilityController =

                mContainer.getDesktopVisibilityController();

        if (!enableDesktopWindowingWallpaperActivity() && desktopVisibilityController != null) {

        if (!WALLPAPER_ACTIVITY.isEnabled(mContext) && desktopVisibilityController != null) {

            // TODO: b/333533253 - Remove after flag rollout

            desktopVisibilityController.setRecentsGestureStart();

        }
@@ -291,7 +291,7 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher 
            }

        }

        super.onGestureAnimationEnd();

        if (!enableDesktopWindowingWallpaperActivity() && desktopVisibilityController != null) {

        if (!WALLPAPER_ACTIVITY.isEnabled(mContext) && desktopVisibilityController != null) {

            // TODO: b/333533253 - Remove after flag rollout

            desktopVisibilityController.setRecentsGestureEnd(endTarget);

        }