From 2b6e0defc076cd5c2d458df7c2d12275e6295cb9 Mon Sep 17 00:00:00 2001 From: MrSluffy Date: Sat, 23 Nov 2024 19:25:44 +0800 Subject: [PATCH] fixed conflict com.android.window.flags --- .../window/{flags => flags2}/CustomFeatureFlags.java | 2 +- .../window/{flags => flags2}/FakeFeatureFlagsImpl.java | 2 +- .../com/android/window/{flags => flags2}/FeatureFlags.java | 2 +- .../android/window/{flags => flags2}/FeatureFlagsImpl.java | 2 +- flags/src/com/android/window/{flags => flags2}/Flags.java | 2 +- .../statehandlers/DesktopVisibilityController.java | 3 +-- .../launcher3/taskbar/LauncherTaskbarUIController.java | 2 +- .../android/launcher3/taskbar/TaskbarModelCallbacks.java | 4 ++-- .../launcher3/taskbar/TaskbarRecentAppsController.kt | 4 ++-- .../android/launcher3/uioverrides/QuickstepLauncher.java | 6 ++---- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 2 +- quickstep/src/com/android/quickstep/RecentTasksList.java | 2 +- quickstep/src/com/android/quickstep/RecentsActivity.java | 5 +---- .../src/com/android/quickstep/RecentsAnimationTargets.java | 2 +- quickstep/src/com/android/quickstep/SystemUiProxy.java | 5 ++--- .../src/com/android/quickstep/TaskShortcutFactory.java | 2 +- .../com/android/quickstep/views/LauncherRecentsView.java | 2 +- src/com/android/launcher3/Launcher.java | 7 +------ 18 files changed, 22 insertions(+), 34 deletions(-) rename flags/src/com/android/window/{flags => flags2}/CustomFeatureFlags.java (99%) rename flags/src/com/android/window/{flags => flags2}/FakeFeatureFlagsImpl.java (97%) rename flags/src/com/android/window/{flags => flags2}/FeatureFlags.java (99%) rename flags/src/com/android/window/{flags => flags2}/FeatureFlagsImpl.java (99%) rename flags/src/com/android/window/{flags => flags2}/Flags.java (99%) diff --git a/flags/src/com/android/window/flags/CustomFeatureFlags.java b/flags/src/com/android/window/flags2/CustomFeatureFlags.java similarity index 99% rename from flags/src/com/android/window/flags/CustomFeatureFlags.java rename to flags/src/com/android/window/flags2/CustomFeatureFlags.java index 70b2873fcc..c52b5a4bb9 100644 --- a/flags/src/com/android/window/flags/CustomFeatureFlags.java +++ b/flags/src/com/android/window/flags2/CustomFeatureFlags.java @@ -1,4 +1,4 @@ -package com.android.window.flags; +package com.android.window.flags2; // TODO(b/303773055): Remove the annotation after access issue is resolved. import java.util.Arrays; diff --git a/flags/src/com/android/window/flags/FakeFeatureFlagsImpl.java b/flags/src/com/android/window/flags2/FakeFeatureFlagsImpl.java similarity index 97% rename from flags/src/com/android/window/flags/FakeFeatureFlagsImpl.java rename to flags/src/com/android/window/flags2/FakeFeatureFlagsImpl.java index de7588f881..3fd351436e 100644 --- a/flags/src/com/android/window/flags/FakeFeatureFlagsImpl.java +++ b/flags/src/com/android/window/flags2/FakeFeatureFlagsImpl.java @@ -1,4 +1,4 @@ -package com.android.window.flags; +package com.android.window.flags2; import java.util.HashMap; import java.util.Map; diff --git a/flags/src/com/android/window/flags/FeatureFlags.java b/flags/src/com/android/window/flags2/FeatureFlags.java similarity index 99% rename from flags/src/com/android/window/flags/FeatureFlags.java rename to flags/src/com/android/window/flags2/FeatureFlags.java index 49b9dfbf35..bba4aabe12 100644 --- a/flags/src/com/android/window/flags/FeatureFlags.java +++ b/flags/src/com/android/window/flags2/FeatureFlags.java @@ -1,4 +1,4 @@ -package com.android.window.flags; +package com.android.window.flags2; // TODO(b/303773055): Remove the annotation after access issue is resolved. /** @hide */ public interface FeatureFlags { diff --git a/flags/src/com/android/window/flags/FeatureFlagsImpl.java b/flags/src/com/android/window/flags2/FeatureFlagsImpl.java similarity index 99% rename from flags/src/com/android/window/flags/FeatureFlagsImpl.java rename to flags/src/com/android/window/flags2/FeatureFlagsImpl.java index 577e7aa4d5..56df1ad9a1 100644 --- a/flags/src/com/android/window/flags/FeatureFlagsImpl.java +++ b/flags/src/com/android/window/flags2/FeatureFlagsImpl.java @@ -1,4 +1,4 @@ -package com.android.window.flags; +package com.android.window.flags2; // TODO(b/303773055): Remove the annotation after access issue is resolved. import com.android.quickstep.util.DeviceConfigHelper; diff --git a/flags/src/com/android/window/flags/Flags.java b/flags/src/com/android/window/flags2/Flags.java similarity index 99% rename from flags/src/com/android/window/flags/Flags.java rename to flags/src/com/android/window/flags2/Flags.java index 3416fbfed3..8888b48ce7 100644 --- a/flags/src/com/android/window/flags/Flags.java +++ b/flags/src/com/android/window/flags2/Flags.java @@ -1,4 +1,4 @@ -package com.android.window.flags; +package com.android.window.flags2; // TODO(b/303773055): Remove the annotation after access issue is resolved. /** @hide */ public final class Flags { diff --git a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java index 62cc0bb90a..4a8672fb6d 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java +++ b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java @@ -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.window.flags2.Flags.enableDesktopWindowingWallpaperActivity; import android.os.Debug; -import android.os.SystemProperties; import android.util.Log; import android.view.View; diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 4569b99ded..0270481571 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -20,7 +20,7 @@ import static com.android.launcher3.statemanager.BaseState.FLAG_NON_INTERACTIVE; import static com.android.launcher3.taskbar.TaskbarEduTooltipControllerKt.TOOLTIP_STEP_FEATURES; import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_VISIBLE; import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS; -import static com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity; +import static com.android.window.flags2.Flags.enableDesktopWindowingWallpaperActivity; import android.animation.Animator; import android.animation.AnimatorSet; diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java index 2b0e1699cc..b065124c97 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarModelCallbacks.java @@ -15,8 +15,8 @@ */ package com.android.launcher3.taskbar; -import static com.android.window.flags.Flags.enableDesktopWindowingMode; -import static com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps; +import static com.android.window.flags2.Flags.enableDesktopWindowingMode; +import static com.android.window.flags2.Flags.enableDesktopWindowingTaskbarRunningApps; import android.util.SparseArray; import android.view.View; diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt index b1fc9ccb02..b31b7c742a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt @@ -25,8 +25,8 @@ import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.statehandlers.DesktopVisibilityController import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController import com.android.quickstep.RecentsModel -import com.android.window.flags.Flags.enableDesktopWindowingMode -import com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps +import com.android.window.flags2.Flags.enableDesktopWindowingMode +import com.android.window.flags2.Flags.enableDesktopWindowingTaskbarRunningApps import java.io.PrintWriter /** diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index ad652b7860..29142f75cc 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -61,8 +61,8 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback; import static com.android.quickstep.util.SplitAnimationTimings.TABLET_HOME_TO_SPLIT; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY; -import static com.android.window.flags.Flags.enableDesktopWindowingMode; -import static com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity; +import static com.android.window.flags2.Flags.enableDesktopWindowingMode; +import static com.android.window.flags2.Flags.enableDesktopWindowingWallpaperActivity; import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50; import android.animation.Animator; @@ -82,7 +82,6 @@ import android.os.Bundle; import android.os.IBinder; import android.os.IRemoteCallback; import android.os.SystemProperties; -import android.os.Trace; import android.util.AttributeSet; import android.view.Display; import android.view.HapticFeedbackConstants; @@ -99,7 +98,6 @@ import android.window.SplashScreen; import androidx.annotation.BinderThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import com.android.app.viewcapture.ViewCaptureFactory; import com.android.launcher3.AbstractFloatingView; diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 1e2b812a3f..7b83f3f884 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -148,7 +148,7 @@ import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import com.android.systemui.shared.system.SysUiStatsLog; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.common.TransactionPool; import com.android.wm.shell.startingsurface.SplashScreenExitAnimationUtils; diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java index 6280f1a33d..1cb9dea616 100644 --- a/quickstep/src/com/android/quickstep/RecentTasksList.java +++ b/quickstep/src/com/android/quickstep/RecentTasksList.java @@ -20,7 +20,7 @@ import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.quickstep.util.SplitScreenUtils.convertShellSplitBoundsToLauncher; -import static com.android.window.flags.Flags.enableDesktopWindowingMode; +import static com.android.window.flags2.Flags.enableDesktopWindowingMode; import static com.android.wm.shell.util.GroupedRecentTaskInfo.TYPE_FREEFORM; import android.app.ActivityManager; diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java index d121f1aea7..1be610f583 100644 --- a/quickstep/src/com/android/quickstep/RecentsActivity.java +++ b/quickstep/src/com/android/quickstep/RecentsActivity.java @@ -26,7 +26,7 @@ import static com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_STATE_O import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely; import static com.android.quickstep.TaskUtils.taskIsATargetWithMode; import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator; -import static com.android.window.flags.Flags.enableDesktopWindowingMode; +import static com.android.window.flags2.Flags.enableDesktopWindowingMode; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -37,14 +37,11 @@ import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.util.Log; -import android.os.Trace; import android.view.Display; import android.view.RemoteAnimationAdapter; import android.view.RemoteAnimationTarget; import android.view.SurfaceControl.Transaction; import android.view.View; -import android.window.RemoteTransition; import android.window.SplashScreen; import androidx.annotation.NonNull; diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java index 82bb453807..b1a7ed3aa3 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationTargets.java @@ -18,7 +18,7 @@ package com.android.quickstep; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.view.RemoteAnimationTarget.MODE_CLOSING; -import static com.android.window.flags.Flags.enableDesktopWindowingMode; +import static com.android.window.flags2.Flags.enableDesktopWindowingMode; import android.app.WindowConfiguration; import android.graphics.Rect; diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 8a6e277bfb..9714701adb 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -23,8 +23,8 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; import static com.android.launcher3.util.SplitConfigurationOptions.StagePosition; import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.RECENT_TASKS_MISSING; import static com.android.quickstep.util.LogUtils.splitFailureMessage; -import static com.android.window.flags.Flags.enableDesktopWindowingMode; -import static com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps; +import static com.android.window.flags2.Flags.enableDesktopWindowingMode; +import static com.android.window.flags2.Flags.enableDesktopWindowingTaskbarRunningApps; import android.app.ActivityManager; import android.app.ActivityOptions; @@ -64,7 +64,6 @@ import androidx.annotation.WorkerThread; import com.android.internal.logging.InstanceId; import com.android.internal.util.ScreenshotRequest; import com.android.internal.view.AppearanceRegion; -import com.android.launcher3.Utilities; import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.SafeCloseable; diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index 4f0d90965a..c1a9c7ef68 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -22,7 +22,7 @@ import static android.view.Surface.ROTATION_0; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_FREE_FORM_TAP; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT; -import static com.android.window.flags.Flags.enableDesktopWindowingMode; +import static com.android.window.flags2.Flags.enableDesktopWindowingMode; import android.app.ActivityOptions; import android.graphics.Bitmap; diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java index 4f6c44e911..b4bca1ced8 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java @@ -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.window.flags2.Flags.enableDesktopWindowingWallpaperActivity; import android.annotation.TargetApi; import android.content.Context; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 8501a40b06..75f0ea4215 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -107,7 +107,6 @@ import static com.android.launcher3.util.SettingsCache.TOUCHPAD_NATURAL_SCROLLIN import android.animation.Animator; import android.animation.AnimatorSet; import android.animation.ValueAnimator; -import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Notification; import android.app.NotificationChannel; @@ -156,21 +155,18 @@ import android.view.WindowManager.LayoutParams; import android.view.accessibility.AccessibilityEvent; import android.view.animation.OvershootInterpolator; import android.widget.Toast; -import android.window.BackEvent; import android.window.OnBackAnimationCallback; import androidx.annotation.CallSuper; import androidx.annotation.FloatRange; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import androidx.annotation.StringRes; import androidx.annotation.UiThread; import androidx.annotation.VisibleForTesting; import androidx.core.os.BuildCompat; //import androidx.window.embedding.RuleController; -import com.android.launcher3.DeviceProfile; import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; import com.android.launcher3.allapps.ActivityAllAppsContainerView; @@ -253,7 +249,6 @@ import com.android.launcher3.util.Thunk; import com.android.launcher3.util.TouchController; import com.android.launcher3.util.TraceHelper; import com.android.launcher3.views.ActivityContext; -import com.android.launcher3.views.ComposeInitializer; import com.android.launcher3.views.FloatingIconView; import com.android.launcher3.views.FloatingSurfaceView; import com.android.launcher3.views.OptionsPopupView; @@ -274,7 +269,7 @@ import com.android.systemui.plugins.LauncherOverlayPlugin; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.shared.LauncherOverlayManager; import com.android.systemui.plugins.shared.LauncherOverlayManager.LauncherOverlayTouchProxy; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import java.io.FileDescriptor; import java.io.PrintWriter;