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

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

Merge "Bugfixes for app-to-web education" into main

parents f45a91fc 9b7e2ffa

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education/AppToWebEducationController.kt

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ class AppToWebEducationController( 
        if (

            desktopState.canEnterDesktopMode &&

                DesktopExperienceFlags.ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION_INTEGRATION

                    .isTrue

                    .isTrue &&

                DesktopExperienceFlags.ENABLE_APP_TO_WEB_EDUCATION_ANIMATION.isTrue

        ) {

            block()

        }

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education/AppToWebEducationFilter.kt

+2 −0
Original line number Diff line number Diff line
@@ -46,11 +46,13 @@ class AppToWebEducationFilter( 


        return if (isAppToWebEducationRequested(taskInfo)) {

            !isEducationViewLimitReached(windowingEducationProto) &&

                taskInfo.isFocused &&

                !isOtherEducationShowing() &&

                !isBrowserApp(taskInfo) &&

                isBrowserSessionAvailable(taskInfo)

        } else {

            !isEducationViewLimitReached(windowingEducationProto) &&

                taskInfo.isFocused &&

                !isOtherEducationShowing() &&

                hasSufficientTimeSinceSetup() &&

                !isFeatureUsedBefore(windowingEducationProto) &&