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

Commit b2c29a62 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Add app-to-web flag to developer options" into main

parents 14f34ee8 8bfd577d

core/java/android/window/DesktopModeFlags.java

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public enum DesktopModeFlags { 
    DISABLE_NON_RESIZABLE_APP_SNAP_RESIZE(Flags::disableNonResizableAppSnapResizing, true),

    ENABLE_WINDOWING_SCALED_RESIZING(Flags::enableWindowingScaledResizing, true),

    ENABLE_DESKTOP_WINDOWING_TASK_LIMIT(Flags::enableDesktopWindowingTaskLimit, true),

    ENABLE_DESKTOP_WINDOWING_APP_TO_WEB(Flags::enableDesktopWindowingAppToWeb, true),

    ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION(Flags::enableDesktopWindowingBackNavigation, true),

    ENABLE_WINDOWING_EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true),

    ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS(

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            boolean hasGlobalFocus, @NonNull Region displayExclusionRegion) {

        Trace.beginSection("DesktopModeWindowDecoration#relayout");



        if (Flags.enableDesktopWindowingAppToWeb()) {

        if (DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_APP_TO_WEB.isTrue()) {

            setCapturedLink(taskInfo.capturedLink, taskInfo.capturedLinkTimestamp);

        }

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

+3 −2
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ import android.util.SparseIntArray; 
import android.view.Display;

import android.webkit.URLUtil;

import android.window.ActivityWindowInfo;

import android.window.DesktopModeFlags;



import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;
@@ -161,7 +162,6 @@ import com.android.server.companion.virtual.VirtualDeviceManagerInternal; 
import com.android.server.pm.SaferIntentUtils;

import com.android.server.utils.Slogf;

import com.android.server.wm.ActivityMetricsLogger.LaunchingState;

import com.android.window.flags.Flags;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -2974,7 +2974,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 


        @Override

        public void accept(ActivityRecord r) {

            if (Flags.enableDesktopWindowingAppToWeb() && mInfo.capturedLink == null) {

            if (DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_APP_TO_WEB.isTrue()

                    && mInfo.capturedLink == null) {

                setCapturedLink(r);

            }

            if (r.mLaunchCookie != null) {