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

Commit 1b96048d authored by Louis Chang's avatar Louis Chang
Browse files

Remove embedded_activity_back_nav_flag 

Bug: 240575809
Test: wm presubmit
Flag: EXEMPT remove embedded_activity_back_nav_flag
Change-Id: Id7ed055e57149136d257b515770181a72266fd61
parent b4eca62f

core/java/android/window/flags/windowing_sdk.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -49,13 +49,6 @@ flag { 
    is_fixed_read_only: true

}



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"

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −8
Original line number Diff line number Diff line
@@ -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;

services/tests/wmtests/src/com/android/server/wm/BackNavigationControllerTests.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java

+8 −10
Original line number Diff line number Diff line
@@ -995,7 +995,6 @@ 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();
@@ -1005,7 +1004,6 @@ public class TaskFragmentTest extends WindowTestsBase { 
        doReturn(3L).when(appLeftTop).getLastWindowCreateTime();

        assertFalse(mWm.moveFocusToAdjacentEmbeddedWindow(winLeftTop));

    }

    }



    @Test

    public void testSetResumedActivity() {