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

Commit 58e99eba authored by Maryam Dehaini's avatar Maryam Dehaini
Browse files

Use Intent#makeMainSelectorActivity to open "Open in browser" link 

Uses makeMainSelectorActivity to open browser link to prevent deep links
from reopening app due to deeplinks when browser is opened.

Bug: 353849102
Test: Open in browser from drive app
Flag: com.android.window.flags.enable_desktop_windowing_app_to_web
Change-Id: I6597808bd65eb109b8fd739639bb9179edcbe9e2
parent 44acf2ef

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

+4 −12
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 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_PINNED;

import static android.content.Intent.ACTION_MAIN;

import static android.content.Intent.CATEGORY_APP_BROWSER;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.view.InputDevice.SOURCE_TOUCHSCREEN;

import static android.view.MotionEvent.ACTION_CANCEL;
@@ -43,11 +45,8 @@ import android.annotation.NonNull; 
import android.app.ActivityManager;

import android.app.ActivityManager.RunningTaskInfo;

import android.app.ActivityTaskManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.Rect;
@@ -424,19 +423,12 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
    }



    private void openInBrowser(Uri uri) {

        final Intent intent = new Intent(Intent.ACTION_VIEW, uri)

                .setComponent(getDefaultBrowser())

        final Intent intent = Intent.makeMainSelectorActivity(ACTION_MAIN, CATEGORY_APP_BROWSER)

                .setData(uri)

                .addFlags(FLAG_ACTIVITY_NEW_TASK);

        mContext.startActivity(intent);

    }



    private ComponentName getDefaultBrowser() {

        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://"));

        final ResolveInfo info = mContext.getPackageManager()

                .resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);

        return info.getComponentInfo().getComponentName();

    }



    private class DesktopModeTouchEventListener extends GestureDetector.SimpleOnGestureListener

            implements View.OnClickListener, View.OnTouchListener, View.OnLongClickListener,

            View.OnGenericMotionListener, DragDetector.MotionEventHandler {