diff --git a/GITHUB_CHANGELOG.md b/GITHUB_CHANGELOG.md index d0417a76df..d0b450b52a 100644 --- a/GITHUB_CHANGELOG.md +++ b/GITHUB_CHANGELOG.md @@ -2,6 +2,16 @@ ## Bubble Tea [QPR1] +### 🏗️ Snapshot 10 (Development 4 Release 1) + +Bug fixes only + +Build: BS10.2011 + +This is a developer-focused change log: +* Fix a lot of internal basic functionality +* Re-added some Lawnchair-specific code + ### 🥞 Snapshot 9 (Development 4 Release 1) This snapshot marks the first time Bubble Tea QPR1 is able to assemble the APK without errors, diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt b/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt index 6d9b087647..32cf6d5d2d 100644 --- a/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt +++ b/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt @@ -34,7 +34,7 @@ import com.android.quickstep.util.DesksUtils.Companion.areMultiDesksFlagsEnabled import com.android.quickstep.views.DesktopTaskView import com.android.quickstep.views.TaskContainer import com.android.quickstep.views.TaskView -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource import java.util.function.Consumer diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index 39e83328c6..fbd4d5522b 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -34,6 +34,7 @@ import static java.util.stream.Collectors.toCollection; import android.app.StatsManager; import android.app.prediction.AppPredictionContext; +import android.app.prediction.AppPredictionManager; import android.app.prediction.AppTargetEvent; import android.content.Context; import android.content.Intent; @@ -302,6 +303,14 @@ public class QuickstepModelDelegate extends ModelDelegate { if (!Utilities.ATLEAST_Q || !mActive) { return; } + AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class); + if (apm == null) { + return; + } + + int usagePerm = mContext.checkCallingOrSelfPermission(Manifest.permission.PACKAGE_USAGE_STATS); + if (usagePerm != PackageManager.PERMISSION_GRANTED) + return; mAllPredictionAppsState.registerPredictor(mContext, new AppPredictionContext.Builder(mContext) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 756ddb4169..323372be9d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -51,7 +51,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_Q import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SHORTCUT_HELPER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; -import static com.android.window.flags.Flags.predictiveBackThreeButtonNav; +import static com.android.window.flags2.Flags.predictiveBackThreeButtonNav; import android.animation.Animator; import android.animation.ArgbEvaluator; diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java index 7fd8b4340b..b19a19076f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java @@ -34,7 +34,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; -import static com.android.window.flags.Flags.predictiveBackThreeButtonNav; +import static com.android.window.flags2.Flags.predictiveBackThreeButtonNav; import android.content.Context; import android.graphics.Rect; diff --git a/quickstep/src/com/android/quickstep/AspectRatioSystemShortcut.kt b/quickstep/src/com/android/quickstep/AspectRatioSystemShortcut.kt index f2242d8d4b..9013ff082b 100644 --- a/quickstep/src/com/android/quickstep/AspectRatioSystemShortcut.kt +++ b/quickstep/src/com/android/quickstep/AspectRatioSystemShortcut.kt @@ -26,7 +26,7 @@ import com.android.launcher3.logging.StatsLogManager.LauncherEvent import com.android.launcher3.popup.SystemShortcut import com.android.quickstep.views.RecentsViewContainer import com.android.quickstep.views.TaskContainer -import com.android.window.flags.Flags.universalResizableByDefault +import com.android.window.flags2.Flags.universalResizableByDefault /** * System shortcut to change the application's aspect ratio compatibility mode. diff --git a/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt b/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt index e8a9840dfc..3b20ae18b1 100644 --- a/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt +++ b/quickstep/src/com/android/quickstep/ExternalDisplaySystemShortcut.kt @@ -24,7 +24,7 @@ import com.android.launcher3.popup.SystemShortcut import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsViewContainer import com.android.quickstep.views.TaskContainer -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.shared.desktopmode.DesktopModeCompatPolicy import com.android.wm.shell.shared.desktopmode.DesktopModeStatus diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java index 71158e1643..d545c47361 100644 --- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java +++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java @@ -26,8 +26,8 @@ import static com.android.launcher3.BaseActivity.INVISIBLE_ALL; import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS; import static com.android.launcher3.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION; import static com.android.launcher3.Flags.enableOverviewBackgroundWallpaperBlur; -import static com.android.window.flags.Flags.predictiveBackThreeButtonNav; -import static com.android.window.flags.Flags.removeDepartTargetFromMotion; +import static com.android.window.flags2.Flags.predictiveBackThreeButtonNav; +import static com.android.window.flags2.Flags.removeDepartTargetFromMotion; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java index 1870db4463..2ae6a19164 100644 --- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java +++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java @@ -120,9 +120,11 @@ public final class OverviewComponentObserver { context.getPackageName()); ResolveInfo secondaryInfo = context.getPackageManager().resolveActivity( mSecondaryHomeIntent, 0); - ComponentName secondaryComponent = new ComponentName(context, - secondaryInfo.activityInfo.name); - mSecondaryHomeIntent.setComponent(secondaryComponent); + if (secondaryInfo != null) { + ComponentName secondaryComponent = new ComponentName(context, + secondaryInfo.activityInfo.name); + mSecondaryHomeIntent.setComponent(secondaryComponent); + } mConfigChangesMap.append(myHomeComponent.hashCode(), info.activityInfo.configChanges); mSetupWizardPkg = context.getString(R.string.setup_wizard_pkg); diff --git a/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt b/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt index 9d4e00d636..63beb0e9aa 100644 --- a/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt +++ b/quickstep/src/com/android/quickstep/input/QuickstepKeyGestureEventsManager.kt @@ -35,7 +35,7 @@ import com.android.launcher3.util.SettingsCache import com.android.launcher3.util.SettingsCache.OnChangeListener import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType.ALT_TAB import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType.UNDEFINED -import com.android.window.flags.Flags +import com.android.window.flags2.Flags /** * Manages subscription and unsubscription to launcher's key gesture events, e.g. all apps and diff --git a/quickstep/src/com/android/quickstep/util/BaseDepthController.java b/quickstep/src/com/android/quickstep/util/BaseDepthController.java index 97f2052626..1ba4de78d2 100644 --- a/quickstep/src/com/android/quickstep/util/BaseDepthController.java +++ b/quickstep/src/com/android/quickstep/util/BaseDepthController.java @@ -123,7 +123,7 @@ public class BaseDepthController { /** * Info for early wakeup requests to SurfaceFlinger. */ - private EarlyWakeupInfo mEarlyWakeupInfo = new EarlyWakeupInfo(); +// private EarlyWakeupInfo mEarlyWakeupInfo = new EarlyWakeupInfo(); public BaseDepthController(QuickstepLauncher activity) { mLauncher = activity; @@ -141,8 +141,8 @@ public class BaseDepthController { new MultiPropertyFactory<>(this, DEPTH, DEPTH_INDEX_COUNT, Float::max); stateDepth = depthProperty.get(DEPTH_INDEX_STATE_TRANSITION); widgetDepth = depthProperty.get(DEPTH_INDEX_WIDGET); - mEarlyWakeupInfo.token = new Binder(); - mEarlyWakeupInfo.trace = BaseDepthController.class.getName(); +// mEarlyWakeupInfo.token = new Binder(); +// mEarlyWakeupInfo.trace = BaseDepthController.class.getName(); } /** @@ -312,11 +312,11 @@ public class BaseDepthController { } Log.d(TAG, "setEarlyWakeup: " + start); if (start) { - Trace.instantForTrack(TRACE_TAG_APP, TAG, "notifyRendererForGpuLoadUp"); +// Trace.instantForTrack(TRACE_TAG_APP, TAG, "notifyRendererForGpuLoadUp"); mLauncher.getRootView().getViewRootImpl().notifyRendererForGpuLoadUp("applyBlur"); - transaction.setEarlyWakeupStart(mEarlyWakeupInfo); +// transaction.setEarlyWakeupStart(); } else { - transaction.setEarlyWakeupEnd(mEarlyWakeupInfo); +// transaction.setEarlyWakeupEnd(); } mInEarlyWakeUp = start; } diff --git a/quickstep/src/com/android/quickstep/util/TransformParams.java b/quickstep/src/com/android/quickstep/util/TransformParams.java index cb591ed035..c70061f635 100644 --- a/quickstep/src/com/android/quickstep/util/TransformParams.java +++ b/quickstep/src/com/android/quickstep/util/TransformParams.java @@ -26,7 +26,7 @@ import androidx.annotation.VisibleForTesting; import com.android.quickstep.RemoteAnimationTargets; import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import java.util.function.Supplier; @@ -257,4 +257,4 @@ public class TransformParams { void onBuildTargetParams(SurfaceProperties builder, RemoteAnimationTarget app, TransformParams params); } -} \ No newline at end of file +} diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt index b705beab6e..ee5b841ed2 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManagerTest.kt @@ -30,8 +30,8 @@ import android.window.TransitionFilter.CONTAINER_ORDER_TOP import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.quickstep.SystemUiProxy -import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX -import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_BUGFIX +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.google.common.truth.Truth.assertThat import org.junit.Before diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt index 180a0fb15c..89ad45f277 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/statehandlers/DesktopVisibilityControllerTest.kt @@ -23,8 +23,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.launcher3.util.DaggerSingletonTracker import com.android.quickstep.SystemUiProxy -import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND -import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND +import com.android.window.flags2.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND +import com.android.window.flags2.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import org.junit.Assert.assertFalse import org.junit.Before diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java index a1b341d763..d53f2b8519 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarNavButtonControllerTest.java @@ -15,7 +15,7 @@ import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IM import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS; import static com.android.launcher3.taskbar.TaskbarNavButtonController.SCREEN_PIN_LONG_PRESS_THRESHOLD; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; -import static com.android.window.flags.Flags.FLAG_PREDICTIVE_BACK_THREE_BUTTON_NAV; +import static com.android.window.flags2.Flags.FLAG_PREDICTIVE_BACK_THREE_BUTTON_NAV; import static com.google.common.truth.Truth.assertThat; diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt index f4b1521649..a56da92225 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarOverflowTest.kt @@ -64,10 +64,10 @@ import com.android.quickstep.util.GroupTask import com.android.quickstep.util.SingleTask import com.android.quickstep.util.SingleTask.Companion.createTaskItemInfo import com.android.systemui.shared.recents.model.Task -import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE -import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS -import com.android.window.flags.Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU -import com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_OVERFLOW +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS +import com.android.window.flags2.Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU +import com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_OVERFLOW import com.android.wm.shell.Flags.FLAG_ENABLE_BUBBLE_BAR import com.android.wm.shell.desktopmode.IDesktopTaskListener import com.google.common.truth.Truth.assertThat diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPopupControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPopupControllerTest.kt index 1cdc4fcb88..6809f7f2f8 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPopupControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarPopupControllerTest.kt @@ -41,7 +41,7 @@ import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices import com.android.quickstep.util.GroupTask -import com.android.window.flags.Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU +import com.android.window.flags2.Flags.FLAG_ENABLE_PINNING_APP_WITH_CONTEXT_MENU import com.google.common.truth.Truth.assertThat import org.junit.Assert import org.junit.Before diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt index f3d828a406..505c415213 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarRecentAppsControllerTest.kt @@ -182,7 +182,7 @@ class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { } @Test - @EnableFlags(com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) + @EnableFlags(com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) fun recentTasksChanged_duringGetTasksLoading_dontCallGetTasks() { // getTasks() should have been called once from init(). verify(mockRecentsModel, times(1)).getTasks(any(), any>>()) @@ -200,7 +200,7 @@ class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { } @Test - @EnableFlags(com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) + @EnableFlags(com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) fun recentTasksChanged_duringGetTasksLoading_getTasksCalledWhenLoadingDone() { val callbackCaptor = argumentCaptor>>() // getTasks() should have been called once from init(). @@ -220,7 +220,7 @@ class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { } @Test - @DisableFlags(com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) + @DisableFlags(com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) fun recentTasksChanged_duringGetTasksLoading_flagDisabled_callGetTasks() { // getTasks() should have been called once from init(). verify(mockRecentsModel, times(1)).getTasks(any(), any>>()) @@ -238,7 +238,7 @@ class TaskbarRecentAppsControllerTest : TaskbarBaseTestCase() { } @Test - @DisableFlags(com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) + @DisableFlags(com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENT_TASKS_THROTTLE_BUGFIX) fun recentTasksChanged_duringGetTasksLoading_flagDisabled_getTasksNotCalledWhenLoadingDone() { val callbackCaptor = argumentCaptor>>() // getTasks() should have been called once from init(). diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewTest.kt index 24ed81f4fa..fb32179f20 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewTest.kt @@ -33,7 +33,7 @@ import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.ForceRtl import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext import com.android.launcher3.util.LauncherMultivalentJUnit.Companion.isRunningInRobolectric -import com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_RECENTS_LAYOUT_TRANSITION +import com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENTS_LAYOUT_TRANSITION import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewWithLayoutTransitionTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewWithLayoutTransitionTest.kt index a223624c5f..3ad302cf9e 100644 --- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewWithLayoutTransitionTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/TaskbarViewWithLayoutTransitionTest.kt @@ -35,8 +35,8 @@ import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.ForceRtl import com.android.launcher3.taskbar.rules.TaskbarWindowSandboxContext import com.android.launcher3.util.LauncherMultivalentJUnit import com.android.launcher3.util.LauncherMultivalentJUnit.EmulatedDevices -import com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_OVERFLOW -import com.android.window.flags.Flags.FLAG_ENABLE_TASKBAR_RECENTS_LAYOUT_TRANSITION +import com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_OVERFLOW +import com.android.window.flags2.Flags.FLAG_ENABLE_TASKBAR_RECENTS_LAYOUT_TRANSITION import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Rule diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java index e8f67e7221..220f2d7090 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/RecentTasksListTest.java @@ -18,7 +18,7 @@ package com.android.quickstep; import static android.view.Display.DEFAULT_DISPLAY; -import static com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND; +import static com.android.window.flags2.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND; import static com.google.common.truth.Truth.assertThat; diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java index a831e82e67..04785abd91 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java @@ -52,7 +52,7 @@ import androidx.test.filters.SmallTest; import androidx.test.platform.app.InstrumentationRegistry; import com.android.systemui.shared.system.RecentsAnimationControllerCompat; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import org.junit.Before; import org.junit.Rule; diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/TopTaskTrackerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/TopTaskTrackerTest.kt index 060862791f..b285010275 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/TopTaskTrackerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TopTaskTrackerTest.kt @@ -32,8 +32,8 @@ import android.view.Display.DEFAULT_DISPLAY import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.internal.R import com.android.launcher3.statehandlers.DesktopVisibilityController.Companion.INACTIVE_DESK_ID -import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND -import com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND +import com.android.window.flags2.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND +import com.android.window.flags2.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_FRONTEND import com.android.wm.shell.Flags.FLAG_ENABLE_SHELL_TOP_TASK_TRACKING import com.android.wm.shell.shared.GroupedTaskInfo import com.android.wm.shell.shared.GroupedTaskInfo.TYPE_DESK diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt index be1b2949a6..30646b42c6 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/input/QuickstepKeyGestureEventsHandlerTest.kt @@ -35,7 +35,7 @@ import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGest import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType.ALT_TAB import com.android.quickstep.input.QuickstepKeyGestureEventsManager.OverviewGestureHandler.OverviewType.UNDEFINED -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Rule diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TransformParamsTest.kt b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TransformParamsTest.kt index 6dbb667a22..e1b31543a8 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TransformParamsTest.kt +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/util/TransformParamsTest.kt @@ -34,7 +34,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.quickstep.RemoteAnimationTargets import com.android.quickstep.util.TransformParams.BuilderProxy.NO_OP -import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/quickstep/tests/src/com/android/quickstep/AspectRatioSystemShortcutTests.kt b/quickstep/tests/src/com/android/quickstep/AspectRatioSystemShortcutTests.kt index fa245da495..7d6323cb6e 100644 --- a/quickstep/tests/src/com/android/quickstep/AspectRatioSystemShortcutTests.kt +++ b/quickstep/tests/src/com/android/quickstep/AspectRatioSystemShortcutTests.kt @@ -161,7 +161,7 @@ class AspectRatioSystemShortcutTests { * When the corresponding feature flag is off, there will not be an option to open aspect ratio * settings. */ - @DisableFlags(com.android.window.flags.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) + @DisableFlags(com.android.window.flags2.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) @Test fun createShortcut_flaggedOff_notCreated() { val task = createTask() @@ -177,7 +177,7 @@ class AspectRatioSystemShortcutTests { * When the screen doesn't meet or exceed sw600dp (eg. phone, watch), there will not be an * option to open aspect ratio settings. */ - @EnableFlags(com.android.window.flags.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) + @EnableFlags(com.android.window.flags2.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) @Test fun createShortcut_sw599dp_notCreated() { val task = createTask() @@ -193,7 +193,7 @@ class AspectRatioSystemShortcutTests { * When the screen does meet or exceed sw600dp (eg. tablet, inner foldable screen, home cinema) * there will be an option to open aspect ratio settings. */ - @EnableFlags(com.android.window.flags.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) + @EnableFlags(com.android.window.flags2.Flags.FLAG_UNIVERSAL_RESIZABLE_BY_DEFAULT) @Test fun createShortcut_sw800dp_created_andOpensSettings() { val task = createTask() diff --git a/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt b/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt index de1df0749d..3e8e0717d9 100644 --- a/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt @@ -50,7 +50,7 @@ import com.android.quickstep.views.TaskViewIcon import com.android.quickstep.views.TaskViewType import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.Task.TaskKey -import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY +import com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODALS_POLICY import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource import com.google.common.truth.Truth.assertThat diff --git a/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt b/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt index 9b384318df..22802a9a8f 100644 --- a/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt +++ b/quickstep/tests/src/com/android/quickstep/ExternalDisplaySystemShortcutTest.kt @@ -47,7 +47,7 @@ import com.android.quickstep.views.TaskView import com.android.quickstep.views.TaskViewIcon import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.Task.TaskKey -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.google.common.truth.Truth.assertThat import org.junit.After diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsLockedTaskbar.java b/quickstep/tests/src/com/android/quickstep/TaplTestsLockedTaskbar.java index 1f0bf35f48..ce6efe4569 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsLockedTaskbar.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsLockedTaskbar.java @@ -39,7 +39,7 @@ import com.android.launcher3.util.rule.SetPropRule; import com.android.launcher3.util.ui.PortraitLandscapeRunner.PortraitLandscape; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import org.junit.Assume; diff --git a/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt b/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt index daa77d2a31..eb053cd032 100644 --- a/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt +++ b/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchAnimatorHelperTest.kt @@ -40,7 +40,7 @@ import com.android.internal.jank.Cuj import com.android.launcher3.desktop.DesktopAppLaunchAnimatorHelper import com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType import com.android.launcher3.util.Executors.MAIN_EXECUTOR -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Rule diff --git a/src/com/android/launcher3/CheckLongPressHelper.java b/src/com/android/launcher3/CheckLongPressHelper.java index b0fae6ed0f..b1980ef621 100644 --- a/src/com/android/launcher3/CheckLongPressHelper.java +++ b/src/com/android/launcher3/CheckLongPressHelper.java @@ -22,7 +22,7 @@ import android.view.View; import android.view.ViewConfiguration; import com.android.launcher3.util.TouchUtil; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; /** * Utility class to handle tripper long press or right click on a view with custom timeout and diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 348292a7d1..85dfed168a 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -268,7 +268,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; diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index c9e67d9ac7..0bc36e40e0 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -28,7 +28,7 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.ScrollableLayoutManager.PREDICTIVE_BACK_MIN_SCALE; import static com.android.launcher3.views.RecyclerViewFastScroller.FastScrollerLocation.ALL_APPS_SCROLLER; -import static com.android.window.flags.Flags.predictiveBackThreeButtonNav; +import static com.android.window.flags2.Flags.predictiveBackThreeButtonNav; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index e7a60f232d..cc49e09c3f 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -364,12 +364,13 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo } if (enableLauncherVisualRefresh()) { - mLeftArrow = findViewById(R.id.left_indicator_arrow); - mRightArrow = findViewById(R.id.right_indicator_arrow); - mRightArrow.setOnClickListener(v -> mContent.snapToPage( - mContent.getCurrentPage() + 1)); - mLeftArrow.setOnClickListener(v -> mContent.snapToPage( - mContent.getCurrentPage() - 1)); + // pE-TODO(QPR1): Investigate +// mLeftArrow = findViewById(R.id.left_indicator_arrow); +// mRightArrow = findViewById(R.id.right_indicator_arrow); +// mRightArrow.setOnClickListener(v -> mContent.snapToPage( +// mContent.getCurrentPage() + 1)); +// mLeftArrow.setOnClickListener(v -> mContent.snapToPage( +// mContent.getCurrentPage() - 1)); } } diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java index e1bdda354c..f1edb976e2 100644 --- a/src/com/android/launcher3/widget/BaseWidgetSheet.java +++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java @@ -19,7 +19,7 @@ import static com.android.app.animation.Interpolators.EMPHASIZED; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_ADD_BUTTON_TAP; -import static com.android.window.flags.Flags.predictiveBackThreeButtonNav; +import static com.android.window.flags2.Flags.predictiveBackThreeButtonNav; import android.content.Context; import android.graphics.Canvas; diff --git a/systemUI/animation/src/com/android/systemui/animation/back/FlingOnBackAnimationCallback.kt b/systemUI/animation/src/com/android/systemui/animation/back/FlingOnBackAnimationCallback.kt index 47ad0b3e0c..bb56f902ae 100644 --- a/systemUI/animation/src/com/android/systemui/animation/back/FlingOnBackAnimationCallback.kt +++ b/systemUI/animation/src/com/android/systemui/animation/back/FlingOnBackAnimationCallback.kt @@ -28,7 +28,7 @@ import com.android.app.animation.Interpolators import com.android.internal.dynamicanimation.animation.DynamicAnimation import com.android.internal.dynamicanimation.animation.FlingAnimation import com.android.internal.dynamicanimation.animation.FloatValueHolder -import com.android.window.flags.Flags.predictiveBackTimestampApi +import com.android.window.flags2.Flags.predictiveBackTimestampApi private const val FLING_FRICTION = 6f private const val SCALE_FACTOR = 100f diff --git a/systemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java b/systemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java index 96ecc352b1..a8279525a1 100644 --- a/systemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java +++ b/systemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java @@ -71,7 +71,7 @@ import com.android.systemui.shared.rotation.RotationButton.RotationButtonUpdates import com.android.systemui.shared.system.ActivityManagerWrapper; 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 java.io.PrintWriter; import java.util.List; diff --git a/wmshell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java b/wmshell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java index 6351722c15..8908cedb32 100644 --- a/wmshell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java +++ b/wmshell/shared/src/com/android/wm/shell/shared/DesktopModeStatus.java @@ -23,7 +23,7 @@ import android.os.Build; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; /** * Constants for desktop mode feature diff --git a/wmshell/shared/src/com/android/wm/shell/shared/bubbles/BubbleAnythingFlagHelper.java b/wmshell/shared/src/com/android/wm/shell/shared/bubbles/BubbleAnythingFlagHelper.java index 5eb094b092..a58d7afebc 100644 --- a/wmshell/shared/src/com/android/wm/shell/shared/bubbles/BubbleAnythingFlagHelper.java +++ b/wmshell/shared/src/com/android/wm/shell/shared/bubbles/BubbleAnythingFlagHelper.java @@ -34,7 +34,7 @@ public class BubbleAnythingFlagHelper { /** Whether creating any bubble and force task excluded from recents are enabled. */ public static boolean enableCreateAnyBubbleWithForceExcludedFromRecents() { return Flags.enableCreateAnyBubble() - && com.android.window.flags.Flags.excludeTaskFromRecents(); + && com.android.window.flags2.Flags.excludeTaskFromRecents(); } /** Whether creating any bubble and app compat fixes for bubbles are enabled. */ @@ -60,16 +60,16 @@ public class BubbleAnythingFlagHelper { } // This is needed to allow the activity behind the root task remains in RESUMED state. - if (!com.android.window.flags.Flags.enableSeeThroughTaskFragments()) { + if (!com.android.window.flags2.Flags.enableSeeThroughTaskFragments()) { return false; } // This is needed to allow the leaf task can be started in expected bounds. - if (!com.android.window.flags.Flags.respectLeafTaskBounds()) { + if (!com.android.window.flags2.Flags.respectLeafTaskBounds()) { return false; } - return com.android.window.flags.Flags.rootTaskForBubble(); + return com.android.window.flags2.Flags.rootTaskForBubble(); } /** Whether the overall bubble anything feature is enabled. */ diff --git a/wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java b/wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java index 084a5b4cac..c974114a1f 100644 --- a/wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java +++ b/wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeStatus.java @@ -20,8 +20,8 @@ import static android.hardware.display.DisplayManager.DISPLAY_CATEGORY_ALL_INCLU import static com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper.enableBubbleToFullscreen; -import android.annotation.NonNull; -import android.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.content.Context; import android.hardware.display.DisplayManager; import android.os.SystemProperties; @@ -32,7 +32,7 @@ import android.window.DesktopModeFlags; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import java.util.Arrays; @@ -215,8 +215,15 @@ public class DesktopModeStatus { if (!enforceDeviceRestrictions()) { return true; } + final boolean enableDesktopModeThroughDevOption; + if (false) { + // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17 + enableDesktopModeThroughDevOption = Flags.enableDesktopModeThroughDevOption(); + } else { + enableDesktopModeThroughDevOption = false; + } final boolean desktopModeSupportedByDevOptions = - Flags.enableDesktopModeThroughDevOption() + enableDesktopModeThroughDevOption && isDesktopModeDevOptionSupported(context); return isDesktopModeSupported(context) || desktopModeSupportedByDevOptions; } diff --git a/wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopStateImpl.kt b/wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopStateImpl.kt index 9761dbf96d..49d015c932 100644 --- a/wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopStateImpl.kt +++ b/wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopStateImpl.kt @@ -58,7 +58,12 @@ class DesktopStateImpl(context: Context) : DesktopState { } override val canShowDesktopModeDevOption: Boolean = - isDeviceEligibleForDesktopModeDevOption && Flags.showDesktopWindowingDevOption() + isDeviceEligibleForDesktopModeDevOption && if (false) { + // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17 + Flags.showDesktopWindowingDevOption() + } else { + false + } private val isDesktopModeEnabledByDevOption = DesktopModeFlags.isDesktopModeForcedEnabled() && canShowDesktopModeDevOption @@ -77,7 +82,12 @@ class DesktopStateImpl(context: Context) : DesktopState { !enforceDeviceRestrictions || isDesktopModeSupported || isDesktopModeDevOptionSupported override val canShowDesktopExperienceDevOption: Boolean = - Flags.showDesktopExperienceDevOption() && isDeviceEligibleForDesktopExperienceDevOption + if (false) { + // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17 + Flags.showDesktopExperienceDevOption() + } else { + false + } && isDeviceEligibleForDesktopExperienceDevOption override val enterDesktopByDefaultOnFreeformDisplay: Boolean = DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX.isTrue || @@ -93,7 +103,12 @@ class DesktopStateImpl(context: Context) : DesktopState { get() { if (!enforceDeviceRestrictions) return true val desktopModeSupportedByDevOptions = - Flags.enableDesktopModeThroughDevOption() && isDesktopModeDevOptionSupported + if (false) { + // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17 + Flags.enableDesktopModeThroughDevOption() + } else { + false + } && isDesktopModeDevOptionSupported return isDesktopModeSupported || desktopModeSupportedByDevOptions } diff --git a/wmshell/src/com/android/wm/shell/back/BackAnimationController.java b/wmshell/src/com/android/wm/shell/back/BackAnimationController.java index 88494807d7..f10bea06ce 100644 --- a/wmshell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/wmshell/src/com/android/wm/shell/back/BackAnimationController.java @@ -31,7 +31,7 @@ import static android.window.TransitionInfo.FLAG_SHOW_WALLPAPER; import static com.android.internal.jank.InteractionJankMonitor.CUJ_PREDICTIVE_BACK_HOME; import static com.android.systemui.Flags.predictiveBackDelayWmTransition; -import static com.android.window.flags.Flags.unifyBackNavigationTransition; +import static com.android.window.flags2.Flags.unifyBackNavigationTransition; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW; import android.annotation.NonNull; @@ -83,7 +83,7 @@ import com.android.internal.protolog.ProtoLog; import com.android.internal.util.LatencyTracker; import com.android.internal.view.AppearanceRegion; import com.android.systemui.animation.TransitionAnimator; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.R; import com.android.wm.shell.common.ExternalInterfaceBinder; import com.android.wm.shell.common.RemoteCallable; diff --git a/wmshell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt b/wmshell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt index 349b27dacd..2950dd0ec0 100644 --- a/wmshell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt +++ b/wmshell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt @@ -53,7 +53,7 @@ import com.android.internal.jank.Cuj import com.android.internal.policy.ScreenDecorationsUtils import com.android.internal.policy.SystemBarUtils import com.android.internal.protolog.ProtoLog -import com.android.window.flags.Flags.predictiveBackTimestampApi +import com.android.window.flags2.Flags.predictiveBackTimestampApi import com.android.wm.shell.R import com.android.wm.shell.RootTaskDisplayAreaOrganizer import com.android.wm.shell.protolog.ShellProtoLogGroup diff --git a/wmshell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java b/wmshell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java index f5b0e359e0..40607a1ff2 100644 --- a/wmshell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java +++ b/wmshell/src/com/android/wm/shell/back/CrossTaskBackAnimation.java @@ -21,7 +21,7 @@ import static android.view.RemoteAnimationTarget.MODE_OPENING; import static android.window.BackEvent.EDGE_RIGHT; import static com.android.internal.jank.InteractionJankMonitor.CUJ_PREDICTIVE_BACK_CROSS_TASK; -import static com.android.window.flags.Flags.predictiveBackTimestampApi; +import static com.android.window.flags2.Flags.predictiveBackTimestampApi; import static com.android.wm.shell.back.BackAnimationConstants.UPDATE_SYSUI_FLAGS_THRESHOLD; import static com.android.wm.shell.back.CrossActivityBackAnimationKt.scaleCentered; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW; diff --git a/wmshell/src/com/android/wm/shell/bubbles/BubbleController.java b/wmshell/src/com/android/wm/shell/bubbles/BubbleController.java index c00fb64d7e..d6877ca8a6 100644 --- a/wmshell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/wmshell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -562,7 +562,7 @@ public class BubbleController implements ConfigurationChangeListener, this::createExternalInterface, this); mShellCommandHandler.addDumpCallback(this::dump, this); - if (com.android.window.flags.Flags.enableExperimentalBubblesController()) { + if (com.android.window.flags2.Flags.enableExperimentalBubblesController()) { try { final BubbleMultitaskingDelegate delegate = new BubbleMultitaskingDelegate( this, mBubbleData, mCurrentUserId); @@ -1425,7 +1425,7 @@ public class BubbleController implements ConfigurationChangeListener, /** Returns whether the given task should be an App Bubble */ public boolean shouldBeAppBubble(@NonNull ActivityManager.RunningTaskInfo taskInfo) { - if (com.android.window.flags.Flags.rootTaskForBubble()) { + if (com.android.window.flags2.Flags.rootTaskForBubble()) { return mAppBubbleRootTaskInfo != null && taskInfo.parentTaskId == mAppBubbleRootTaskInfo.taskId; } diff --git a/wmshell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java b/wmshell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java index 82acfe5478..a0cfdc18cf 100644 --- a/wmshell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java +++ b/wmshell/src/com/android/wm/shell/compatui/CompatUIWindowManagerAbstract.java @@ -43,7 +43,7 @@ import android.view.WindowManager; import android.view.WindowlessWindowManager; import com.android.internal.annotations.VisibleForTesting; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.SyncTransactionQueue; diff --git a/wmshell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java b/wmshell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java index d1bd2c0b8e..3e6b30f431 100644 --- a/wmshell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java +++ b/wmshell/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayout.java @@ -32,7 +32,7 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.R; /** diff --git a/wmshell/src/com/android/wm/shell/dagger/WMShellBaseModule.java b/wmshell/src/com/android/wm/shell/dagger/WMShellBaseModule.java index 90dd41513f..73482d22ed 100644 --- a/wmshell/src/com/android/wm/shell/dagger/WMShellBaseModule.java +++ b/wmshell/src/com/android/wm/shell/dagger/WMShellBaseModule.java @@ -39,7 +39,7 @@ import android.window.SystemPerformanceHinter; import com.android.internal.logging.UiEventLogger; import com.android.launcher3.icons.IconProvider; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.ProtoLogController; import com.android.wm.shell.R; import com.android.wm.shell.RootDisplayAreaOrganizer; diff --git a/wmshell/src/com/android/wm/shell/dagger/WMShellModule.java b/wmshell/src/com/android/wm/shell/dagger/WMShellModule.java index 4e2e84f1f1..15f669e22d 100644 --- a/wmshell/src/com/android/wm/shell/dagger/WMShellModule.java +++ b/wmshell/src/com/android/wm/shell/dagger/WMShellModule.java @@ -23,7 +23,7 @@ import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_PO import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMIT; import static com.android.systemui.Flags.enableViewCaptureTracing; -import static com.android.window.flags.Flags.enableInorderTransitionCallbacksForDesktop; +import static com.android.window.flags2.Flags.enableInorderTransitionCallbacksForDesktop; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/wmshell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/wmshell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index adb7004e19..13c0e4d3c5 100644 --- a/wmshell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/wmshell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -90,7 +90,7 @@ import com.android.internal.jank.InteractionJankMonitor import com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightPx import com.android.internal.protolog.ProtoLog import com.android.internal.util.LatencyTracker -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.Flags.enableFlexibleSplit import com.android.wm.shell.R import com.android.wm.shell.RootTaskDisplayAreaOrganizer diff --git a/wmshell/src/com/android/wm/shell/draganddrop/DragUtils.java b/wmshell/src/com/android/wm/shell/draganddrop/DragUtils.java index 4df9ae4b2e..0f049a7df6 100644 --- a/wmshell/src/com/android/wm/shell/draganddrop/DragUtils.java +++ b/wmshell/src/com/android/wm/shell/draganddrop/DragUtils.java @@ -57,7 +57,7 @@ public class DragUtils { // Clip data contains an app drag initiated from SysUI, handle it return true; } - if (com.android.window.flags.Flags.delegateUnhandledDrags() + if (com.android.window.flags2.Flags.delegateUnhandledDrags() && getLaunchIntent(event) != null) { // Clip data contains a launchable intent drag, handle it return true; diff --git a/wmshell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java b/wmshell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java index f96fa7b24f..aa230c86d1 100644 --- a/wmshell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java +++ b/wmshell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java @@ -30,7 +30,7 @@ import android.window.WindowContainerToken; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.desktopmode.DesktopBackNavTransitionObserver; import com.android.wm.shell.desktopmode.DesktopImeHandler; import com.android.wm.shell.desktopmode.DesktopImmersiveController; diff --git a/wmshell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java b/wmshell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java index c0a0f469ad..d702abe8de 100644 --- a/wmshell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java +++ b/wmshell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java @@ -54,7 +54,7 @@ import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; import com.android.internal.protolog.ProtoLog; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.TaskStackListenerCallback; diff --git a/wmshell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/wmshell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index e984c91976..5cbd371f03 100644 --- a/wmshell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/wmshell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -35,9 +35,9 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT; import static android.window.TransitionInfo.FLAG_IS_DISPLAY; import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REORDER; -import static com.android.window.flags.Flags.enableFullScreenWindowOnRemovingSplitScreenStageBugfix; -import static com.android.window.flags.Flags.enableMultiDisplaySplit; -import static com.android.window.flags.Flags.enableNonDefaultDisplaySplit; +import static com.android.window.flags2.Flags.enableFullScreenWindowOnRemovingSplitScreenStageBugfix; +import static com.android.window.flags2.Flags.enableMultiDisplaySplit; +import static com.android.window.flags2.Flags.enableNonDefaultDisplaySplit; import static com.android.wm.shell.Flags.enableEnterSplitRemoveBubble; import static com.android.wm.shell.Flags.enableFlexibleSplit; import static com.android.wm.shell.Flags.enableFlexibleTwoAppSplit; diff --git a/wmshell/src/com/android/wm/shell/startingsurface/StartingWindowController.java b/wmshell/src/com/android/wm/shell/startingsurface/StartingWindowController.java index 41436e76b7..6002011825 100644 --- a/wmshell/src/com/android/wm/shell/startingsurface/StartingWindowController.java +++ b/wmshell/src/com/android/wm/shell/startingsurface/StartingWindowController.java @@ -51,7 +51,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.protolog.ProtoLog; import com.android.internal.util.function.TriConsumer; import com.android.launcher3.icons.IconProvider; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.ExternalInterfaceBinder; import com.android.wm.shell.common.RemoteCallable; diff --git a/wmshell/src/com/android/wm/shell/taskview/TaskViewTaskController.java b/wmshell/src/com/android/wm/shell/taskview/TaskViewTaskController.java index 0499025ad9..5ecb131d24 100644 --- a/wmshell/src/com/android/wm/shell/taskview/TaskViewTaskController.java +++ b/wmshell/src/com/android/wm/shell/taskview/TaskViewTaskController.java @@ -413,7 +413,7 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { // should always be consumed, otherwise the handle may block app content. flags = FLAG_FORCE_CONSUMING | FLAG_FORCE_CONSUMING_OPAQUE_CAPTION_BAR; } - if (com.android.window.flags.Flags.relativeInsets()) { + if (com.android.window.flags2.Flags.relativeInsets()) { wct.addInsetsSource(mTaskToken, mCaptionInsetsOwner, 0, WindowInsets.Type.captionBar(), Insets.of(0, mCaptionInsets.height(), 0, 0), null /* boundingRects */, flags); diff --git a/wmshell/src/com/android/wm/shell/taskview/TaskViewTransitions.java b/wmshell/src/com/android/wm/shell/taskview/TaskViewTransitions.java index 7e39a7f905..549c87eec3 100644 --- a/wmshell/src/com/android/wm/shell/taskview/TaskViewTransitions.java +++ b/wmshell/src/com/android/wm/shell/taskview/TaskViewTransitions.java @@ -24,8 +24,8 @@ import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_TO_BACK; import static android.view.WindowManager.TRANSIT_TO_FRONT; -import static com.android.window.flags.Flags.FLAG_EXCLUDE_TASK_FROM_RECENTS; -import static com.android.window.flags.Flags.enableHandlersDebuggingMode; +import static com.android.window.flags2.Flags.FLAG_EXCLUDE_TASK_FROM_RECENTS; +import static com.android.window.flags2.Flags.enableHandlersDebuggingMode; import static com.android.wm.shell.Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE; import static com.android.wm.shell.bubbles.util.BubbleUtils.getExitBubbleTransaction; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES_NOISY; diff --git a/wmshell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/wmshell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java index 57fd445e21..708863e409 100644 --- a/wmshell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java +++ b/wmshell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java @@ -107,7 +107,7 @@ import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.policy.ScreenDecorationsUtils; import com.android.internal.policy.TransitionAnimation; import com.android.internal.protolog.ProtoLog; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.animation.SizeChangeAnimation; import com.android.wm.shell.common.DisplayController; @@ -362,7 +362,7 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { final ArrayList animations = new ArrayList<>(); mAnimations.put(transition, animations); - final boolean isTaskTransition = com.android.window.flags.Flags.transitionHandlerCujTags() + final boolean isTaskTransition = com.android.window.flags2.Flags.transitionHandlerCujTags() && isTaskTransition(info); final Runnable onAnimFinish = () -> { diff --git a/wmshell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/wmshell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index f37c063613..87b35abc4b 100644 --- a/wmshell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/wmshell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -91,7 +91,7 @@ import com.android.internal.jank.Cuj; import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.protolog.ProtoLog; import com.android.internal.util.LatencyTracker; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.R; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTaskOrganizer; diff --git a/wmshell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/wmshell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index 74ef113764..35be3e6e21 100644 --- a/wmshell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/wmshell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -78,7 +78,7 @@ import android.window.WindowContainerTransaction; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.SystemBarUtils; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.R; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTaskOrganizer; diff --git a/wmshell/src/com/android/wm/shell/windowdecor/HandleMenu.java b/wmshell/src/com/android/wm/shell/windowdecor/HandleMenu.java index df0836c112..b741a42f2d 100644 --- a/wmshell/src/com/android/wm/shell/windowdecor/HandleMenu.java +++ b/wmshell/src/com/android/wm/shell/windowdecor/HandleMenu.java @@ -49,7 +49,7 @@ import android.window.SurfaceSyncGroup; import androidx.annotation.VisibleForTesting; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.R; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayLayout; diff --git a/wmshell/src/com/android/wm/shell/windowdecor/viewholder/AppHandleViewHolder.kt b/wmshell/src/com/android/wm/shell/windowdecor/viewholder/AppHandleViewHolder.kt index 8bb2d95a3e..bad6dd7906 100644 --- a/wmshell/src/com/android/wm/shell/windowdecor/viewholder/AppHandleViewHolder.kt +++ b/wmshell/src/com/android/wm/shell/windowdecor/viewholder/AppHandleViewHolder.kt @@ -40,7 +40,7 @@ import android.window.DesktopModeFlags import androidx.core.view.ViewCompat import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat import com.android.internal.policy.SystemBarUtils -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.R import com.android.wm.shell.desktopmode.DesktopModeUiEventLogger import com.android.wm.shell.desktopmode.DesktopModeUiEventLogger.DesktopUiEventEnum.A11Y_APP_HANDLE_MENU_OPENED diff --git a/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt b/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt index e77a457291..25f99c0857 100644 --- a/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt +++ b/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/CloseAllAppsWithAppHeaderExit.kt @@ -27,7 +27,7 @@ import com.android.server.wm.flicker.helpers.DesktopModeAppHelper import com.android.server.wm.flicker.helpers.MailAppHelper import com.android.server.wm.flicker.helpers.NonResizeableAppHelper import com.android.server.wm.flicker.helpers.SimpleAppHelper -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.flicker.service.common.Utils import org.junit.After import org.junit.Assume diff --git a/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt b/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt index fe139d2d24..14272f7ade 100644 --- a/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt +++ b/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/EnterDesktopWithDrag.kt @@ -25,7 +25,7 @@ import androidx.test.uiautomator.UiDevice import com.android.launcher3.tapl.LauncherInstrumentation import com.android.server.wm.flicker.helpers.DesktopModeAppHelper import com.android.server.wm.flicker.helpers.SimpleAppHelper -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.flicker.service.common.Utils import org.junit.After import org.junit.Assume diff --git a/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt b/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt index ac9089a5c1..ba1eb34f85 100644 --- a/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt +++ b/wmshell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/scenarios/ResizeAppWithCornerResize.kt @@ -25,7 +25,7 @@ import androidx.test.uiautomator.UiDevice import com.android.launcher3.tapl.LauncherInstrumentation import com.android.server.wm.flicker.helpers.DesktopModeAppHelper import com.android.server.wm.flicker.helpers.SimpleAppHelper -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.flicker.service.common.Utils import org.junit.After import org.junit.Assume diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java index 88668ebf73..dfcf357332 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java @@ -558,7 +558,7 @@ public class BackAnimationControllerTest extends ShellTestCase { @EnableFlags({com.android.systemui.shared.Flags.FLAG_RETURN_ANIMATION_FRAMEWORK_LIBRARY, com.android.systemui.shared.Flags.FLAG_RETURN_ANIMATION_FRAMEWORK_LONG_LIVED, - com.android.window.flags.Flags.FLAG_UNIFY_BACK_NAVIGATION_TRANSITION}) + com.android.window.flags2.Flags.FLAG_UNIFY_BACK_NAVIGATION_TRANSITION}) @Test public void appCallback_receivesTakeoverHandler_whenAvailable() throws RemoteException { registerAnimation(BackNavigationInfo.TYPE_CROSS_TASK); diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/common/DisplayControllerTests.java b/wmshell/tests/unittest/src/com/android/wm/shell/common/DisplayControllerTests.java index 3f58da719b..c4d75a42f9 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/common/DisplayControllerTests.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/common/DisplayControllerTests.java @@ -49,7 +49,7 @@ import android.view.IWindowManager; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestSyncExecutor; import com.android.wm.shell.shared.desktopmode.FakeDesktopState; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java index 2b833a51c6..b6d93ca750 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/CompatUIControllerTest.java @@ -47,7 +47,7 @@ import android.view.accessibility.AccessibilityManager; import androidx.annotation.NonNull; import androidx.test.filters.SmallTest; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.common.DisplayController; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/LetterboxEduDialogLayoutTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/LetterboxEduDialogLayoutTest.java index c6884ea173..9b87c36d64 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/LetterboxEduDialogLayoutTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/LetterboxEduDialogLayoutTest.java @@ -16,7 +16,7 @@ package com.android.wm.shell.compatui; -import static com.android.window.flags.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; +import static com.android.window.flags2.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduLayoutTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduLayoutTest.java index 31ea8f7635..d375a715b1 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduLayoutTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduLayoutTest.java @@ -16,7 +16,7 @@ package com.android.wm.shell.compatui; -import static com.android.window.flags.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; +import static com.android.window.flags2.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduWindowManagerTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduWindowManagerTest.java index 1b2c094477..6543252fac 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduWindowManagerTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/ReachabilityEduWindowManagerTest.java @@ -16,7 +16,7 @@ package com.android.wm.shell.compatui; -import static com.android.window.flags.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; +import static com.android.window.flags2.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/RestartDialogLayoutTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/RestartDialogLayoutTest.java index 5075453d8c..707f2e7630 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/RestartDialogLayoutTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/RestartDialogLayoutTest.java @@ -16,7 +16,7 @@ package com.android.wm.shell.compatui; -import static com.android.window.flags.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; +import static com.android.window.flags2.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/RestartDialogWindowManagerTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/RestartDialogWindowManagerTest.java index 779a5ca106..5bd3b11c17 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/RestartDialogWindowManagerTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/RestartDialogWindowManagerTest.java @@ -16,7 +16,7 @@ package com.android.wm.shell.compatui; -import static com.android.window.flags.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; +import static com.android.window.flags2.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; import android.app.ActivityManager; import android.app.TaskInfo; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayoutTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayoutTest.java index 2b4d5f1257..e66faa6471 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayoutTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/compatui/UserAspectRatioSettingsLayoutTest.java @@ -17,7 +17,7 @@ package com.android.wm.shell.compatui; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; -import static com.android.window.flags.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; +import static com.android.window.flags2.Flags.FLAG_APP_COMPAT_UI_FRAMEWORK; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeEventLoggerTest.kt b/wmshell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeEventLoggerTest.kt index 695cf600b3..acda66fa2e 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeEventLoggerTest.kt +++ b/wmshell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeEventLoggerTest.kt @@ -26,7 +26,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.verify import com.android.dx.mockito.inline.extended.ExtendedMockito.verifyNoMoreInteractions import com.android.internal.util.FrameworkStatsLog import com.android.modules.utils.testing.ExtendedMockitoRule -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.EventLogTags import com.android.wm.shell.ShellTestCase import com.android.wm.shell.TestRunningTaskInfoBuilder diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskListenerTests.java b/wmshell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskListenerTests.java index 019fa6c5cb..61f9915f09 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskListenerTests.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskListenerTests.java @@ -20,9 +20,9 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.view.Display.INVALID_DISPLAY; -import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION; -import static com.android.window.flags.Flags.FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS; -import static com.android.window.flags.Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION; +import static com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION; +import static com.android.window.flags2.Flags.FLAG_ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS; +import static com.android.window.flags2.Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -38,7 +38,7 @@ import android.view.SurfaceControl; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestRunningTaskInfoBuilder; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserverTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserverTest.java index 2dff2fb39a..e79169fdee 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserverTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserverTest.java @@ -46,7 +46,7 @@ import android.window.WindowContainerToken; import androidx.test.filters.SmallTest; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.desktopmode.DesktopBackNavTransitionObserver; import com.android.wm.shell.desktopmode.DesktopImeHandler; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java b/wmshell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java index 836238a064..ae6ba3d6c7 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java +++ b/wmshell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java @@ -22,7 +22,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; -import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE; +import static com.android.window.flags2.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE; import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_DESK; import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_FULLSCREEN; import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_SPLIT; @@ -68,7 +68,7 @@ import android.view.SurfaceControl; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import com.android.window.flags.Flags; +import com.android.window.flags2.Flags; import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestShellExecutor; diff --git a/wmshell/tests/unittest/src/com/android/wm/shell/recents/TaskStackTransitionObserverTest.kt b/wmshell/tests/unittest/src/com/android/wm/shell/recents/TaskStackTransitionObserverTest.kt index 769407b370..4d3061b81e 100644 --- a/wmshell/tests/unittest/src/com/android/wm/shell/recents/TaskStackTransitionObserverTest.kt +++ b/wmshell/tests/unittest/src/com/android/wm/shell/recents/TaskStackTransitionObserverTest.kt @@ -39,7 +39,7 @@ import android.window.TransitionInfo import android.window.TransitionInfo.FLAG_MOVED_TO_TOP import android.window.WindowContainerToken import androidx.test.filters.SmallTest -import com.android.window.flags.Flags +import com.android.window.flags2.Flags import com.android.wm.shell.ShellTaskOrganizer import com.android.wm.shell.ShellTestCase import com.android.wm.shell.TestShellExecutor