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

Commit 90f9700b authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "[dev_option] Move DestopModeFlags out of android.windows.flags" into main

parents 26b27579 8c0dc4c6

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
package com.android.launcher3.statehandlers;



import static android.view.View.VISIBLE;

import static android.window.flags.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY;



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

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

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

package com.android.launcher3.taskbar;



import static android.window.flags.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY;



import static com.android.launcher3.QuickstepTransitionManager.TASKBAR_TO_APP_DURATION;

import static com.android.launcher3.QuickstepTransitionManager.getTaskbarToHomeDuration;

quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
package com.android.launcher3.taskbar



import android.content.Context

import android.window.flags.DesktopModeFlags

import android.window.DesktopModeFlags

import androidx.annotation.VisibleForTesting

import com.android.launcher3.Flags.enableRecentsInTaskbar

import com.android.launcher3.model.data.ItemInfo

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import static android.app.ActivityTaskManager.INVALID_TASK_ID; 
import static android.os.Trace.TRACE_TAG_APP;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_OPTIMIZE_MEASURE;

import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;

import static android.window.flags.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY;



import static com.android.app.animation.Interpolators.EMPHASIZED;

import static com.android.internal.jank.Cuj.CUJ_LAUNCHER_LAUNCH_APP_PAIR_FROM_WORKSPACE;

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

+3 −3
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ import android.view.ViewTreeObserver.OnScrollChangedListener; 
import android.view.WindowInsets;

import android.view.animation.Interpolator;

import android.widget.Toast;

import android.window.DesktopModeFlags;

import android.window.PictureInPictureSurfaceTransaction;

import android.window.flags.DesktopModeFlags;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -156,6 +156,8 @@ import com.android.wm.shell.shared.TransactionPool; 
import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

import com.android.wm.shell.shared.startingsurface.SplashScreenExitAnimationUtils;



import kotlin.Unit;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;
@@ -165,8 +167,6 @@ import java.util.Optional; 
import java.util.OptionalInt;

import java.util.function.Consumer;



import kotlin.Unit;



/**

 * Handles the navigation gestures when Launcher is the default home activity.

 */