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

Commit 9c062e47 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a feature flag to toggle DW carousel detach" into main

parents a01ae913 edd7ff2f

aconfig/launcher_overview.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -48,3 +48,10 @@ flag { 
      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_desktop_windowing_carousel_detach"

    namespace: "launcher_overview"

    description: "Makes the desktop windowing task carousel detaches from fullscreen task carousel during quickswitch."

    bug: "353947917"

}
 
 No newline at end of file

quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3.uioverrides.states;



import static com.android.launcher3.Flags.enableDesktopWindowingCarouselDetach;

import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation;

import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKGROUND;
@@ -91,7 +92,7 @@ public class BackgroundAppState extends OverviewState { 


    @Override

    public boolean detachDesktopCarousel() {

        return true;

        return enableDesktopWindowingCarouselDetach();

    }



    @Override

quickstep/src/com/android/quickstep/fallback/RecentsState.java

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.quickstep.fallback;



import static com.android.launcher3.Flags.enableDesktopWindowingCarouselDetach;

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

import static com.android.launcher3.uioverrides.states.BackgroundAppState.getOverviewScaleAndOffsetForBackgroundState;

import static com.android.launcher3.uioverrides.states.OverviewModalTaskState.getOverviewScaleAndOffsetForModalState;
@@ -152,7 +153,7 @@ public class RecentsState implements BaseState<RecentsState> { 


    @Override

    public boolean detachDesktopCarousel() {

        return hasFlag(FLAG_DETACH_DESKTOP_CAROUSEL);

        return hasFlag(FLAG_DETACH_DESKTOP_CAROUSEL) && enableDesktopWindowingCarouselDetach();

    }



    /**