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

Commit 9b7e2ffa authored by Maryam Dehaini's avatar Maryam Dehaini
Browse files

Bugfixes for app-to-web education

1. Only open education if task is focused
2. Only show education if animation flag is enabled

Bug: 359226240
Test: open education
Flag: com.android.window.flags.enable_app_to_web_education_animation
Change-Id: I9b89db02023bdabc451a0f21a74c43b4d39ce65d
parent adf48f86
Loading
Loading
Loading
Loading
+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()
        }
+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) &&