diff options
4 files changed, 10 insertions, 27 deletions
diff --git a/core/java/android/window/flags/windowing_sdk.aconfig b/core/java/android/window/flags/windowing_sdk.aconfig index 4230641e2e12..4c18bbfbeebf 100644 --- a/core/java/android/window/flags/windowing_sdk.aconfig +++ b/core/java/android/window/flags/windowing_sdk.aconfig @@ -51,13 +51,6 @@ flag { flag { namespace: "windowing_sdk" - name: "embedded_activity_back_nav_flag" - description: "Refines embedded activity back navigation behavior" - bug: "293642394" -} - -flag { - namespace: "windowing_sdk" name: "cover_display_opt_in" is_exported: true description: "Properties to allow apps and activities to opt-in to cover display rendering" diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index a21806819d80..482405d7afc6 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -118,12 +118,12 @@ import static com.android.server.LockGuard.installLock; import static com.android.server.policy.PhoneWindowManager.TRACE_WAIT_FOR_ALL_WINDOWS_DRAWN_METHOD; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.ActivityTaskManagerService.POWER_MODE_REASON_CHANGE_DISPLAY; -import static com.android.server.wm.DisplayContent.IME_TARGET_CONTROL; -import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING; import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND; import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND_FLOATING; import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_SOLID_COLOR; import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_WALLPAPER; +import static com.android.server.wm.DisplayContent.IME_TARGET_CONTROL; +import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING; import static com.android.server.wm.RootWindowContainer.MATCH_ATTACHED_TASK_OR_RECENT_TASKS; import static com.android.server.wm.SensitiveContentPackages.PackageInfo; import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL; @@ -357,7 +357,6 @@ import com.android.server.policy.WindowManagerPolicy.ScreenOffListener; import com.android.server.power.ShutdownThread; import com.android.server.utils.PriorityDump; import com.android.server.wallpaper.WallpaperCropper.WallpaperCropUtils; -import com.android.window.flags.Flags; import dalvik.annotation.optimization.NeverCompile; @@ -9390,11 +9389,6 @@ public class WindowManagerService extends IWindowManager.Stub return focusedActivity; } - if (!Flags.embeddedActivityBackNavFlag()) { - // Return if flag is not enabled. - return focusedActivity; - } - if (!focusedActivity.isEmbedded()) { // Return if the focused activity is not embedded. return focusedActivity; diff --git a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java index afa22bc5eae8..a159ce354a7b 100644 --- a/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java @@ -72,7 +72,6 @@ import android.window.TaskSnapshot; import android.window.WindowOnBackInvokedDispatcher; import com.android.server.LocalServices; -import com.android.window.flags.Flags; import org.junit.Before; import org.junit.Test; @@ -672,7 +671,6 @@ public class BackNavigationControllerTests extends WindowTestsBase { @Test public void testBackOnMostRecentWindowInActivityEmbedding() { - mSetFlagsRule.enableFlags(Flags.FLAG_EMBEDDED_ACTIVITY_BACK_NAV_FLAG); final Task task = createTask(mDefaultDisplay); final TaskFragmentOrganizer organizer = new TaskFragmentOrganizer(Runnable::run); final TaskFragment primaryTf = createTaskFragmentWithEmbeddedActivity(task, organizer); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java index 3c247a03d744..6be1af2c143f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java @@ -995,16 +995,14 @@ public class TaskFragmentTest extends WindowTestsBase { // The focus should change. assertEquals(winLeftTop, mDisplayContent.mCurrentFocus); - if (Flags.embeddedActivityBackNavFlag()) { - // Move focus if the adjacent activity is more recently active. - doReturn(1L).when(appLeftTop).getLastWindowCreateTime(); - doReturn(2L).when(appRightTop).getLastWindowCreateTime(); - assertTrue(mWm.moveFocusToAdjacentEmbeddedWindow(winLeftTop)); - - // Do not move the focus if the adjacent activity is less recently active. - doReturn(3L).when(appLeftTop).getLastWindowCreateTime(); - assertFalse(mWm.moveFocusToAdjacentEmbeddedWindow(winLeftTop)); - } + // Move focus if the adjacent activity is more recently active. + doReturn(1L).when(appLeftTop).getLastWindowCreateTime(); + doReturn(2L).when(appRightTop).getLastWindowCreateTime(); + assertTrue(mWm.moveFocusToAdjacentEmbeddedWindow(winLeftTop)); + + // Do not move the focus if the adjacent activity is less recently active. + doReturn(3L).when(appLeftTop).getLastWindowCreateTime(); + assertFalse(mWm.moveFocusToAdjacentEmbeddedWindow(winLeftTop)); } @Test |