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

Commit d6ed0b70 authored by Maryam Dehaini's avatar Maryam Dehaini
Browse files

Updating AppToWebUtils due to API changes 

Bug: 384877505
Flag: com.android.window.flags.enable_desktop_windowing_app_to_web_education
Test: atest DesktopModeWindowDecorationTests
Change-Id: I8f1b1d87ac31f3e76fd1c5f0ca27eec93f0befa4
parent e5408b76

libs/WindowManager/Shell/src/com/android/wm/shell/apptoweb/AppToWebUtils.kt

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
package com.android.wm.shell.apptoweb



import android.app.assist.AssistContent

import android.app.assist.AssistContent.EXTRA_SESSION_TRANSFER_WEB_URI

import android.content.Context

import android.content.Intent

import android.content.Intent.ACTION_VIEW
@@ -113,5 +112,5 @@ fun getDomainVerificationUserState( 
 * Returns the web uri from the given [AssistContent].

 */

fun AssistContent.getSessionWebUri(): Uri? {

    return extras.getParcelable(EXTRA_SESSION_TRANSFER_WEB_URI) ?: webUri

    return sessionTransferUri ?: webUri

}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java

+4 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.app.assist.AssistContent.EXTRA_SESSION_TRANSFER_WEB_URI;

import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;

import static android.view.InsetsSource.FLAG_FORCE_CONSUMING;

import static android.view.InsetsSource.FLAG_FORCE_CONSUMING_OPAQUE_CAPTION_BAR;
@@ -1176,7 +1175,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB)

    public void webUriLink_webUriLinkUsedWhenWhenAvailable() {

    public void sessionTransferUri_sessionTransferUriUsedWhenWhenAvailable() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(true /* visible */);

        final DesktopModeWindowDecoration decor = createWindowDecoration(

                taskInfo, TEST_URI1 /* captured link */, TEST_URI2 /* web uri */,
@@ -1188,7 +1187,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB)

    public void webUriLink_webUriLinkUsedWhenSessionTransferUriUnavailable() {

    public void webUri_webUriUsedWhenSessionTransferUriUnavailable() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(true /* visible */);

        final DesktopModeWindowDecoration decor = createWindowDecoration(

                taskInfo, TEST_URI1 /* captured link */, TEST_URI2 /* web uri */,
@@ -1200,7 +1199,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB)

    public void genericLink_genericLinkUsedWhenCapturedLinkAndWebUriUnavailable() {

    public void genericLink_genericLinkUsedWhenCapturedLinkAndAssistContentUriUnavailable() {

        final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(true /* visible */);

        final DesktopModeWindowDecoration decor = createWindowDecoration(

                taskInfo, null /* captured link */, null /* web uri */,
@@ -1490,7 +1489,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { 
        taskInfo.capturedLink = capturedLink;

        taskInfo.capturedLinkTimestamp = System.currentTimeMillis();

        mAssistContent.setWebUri(webUri);

        mAssistContent.getExtras().putObject(EXTRA_SESSION_TRANSFER_WEB_URI, sessionTransferUri);

        mAssistContent.setSessionTransferUri(sessionTransferUri);

        final String genericLinkString = genericLink == null ? null : genericLink.toString();

        doReturn(genericLinkString).when(mMockGenericLinksParser).getGenericLink(any());

        // Relayout to set captured link