diff options
3 files changed, 9 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education/AppToWebEducationController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education/AppToWebEducationController.kt index bfe1b12c9605..ac0a6275cfbd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education/AppToWebEducationController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education/AppToWebEducationController.kt @@ -116,7 +116,12 @@ class AppToWebEducationController( } private inline fun runIfEducationFeatureEnabled(block: () -> Unit) { - if (canEnterDesktopMode(context) && Flags.enableDesktopWindowingAppToWebEducation()) block() + if ( + canEnterDesktopMode(context) && + Flags.enableDesktopWindowingAppToWebEducationIntegration() + ) { + block() + } } private fun showEducation(captionState: CaptionState, colorScheme: EducationColorScheme) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index 96cc559a64ae..c023fcb90c28 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -1428,7 +1428,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin /* openInBrowserClickListener= */ (intent) -> { mOpenInBrowserClickListener.accept(intent); onCapturedLinkExpired(); - if (Flags.enableDesktopWindowingAppToWebEducation()) { + if (Flags.enableDesktopWindowingAppToWebEducationIntegration()) { mWindowDecorCaptionHandleRepository.onAppToWebUsage(); } return Unit.INSTANCE; @@ -1681,7 +1681,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin /** Returns true if at least one education flag is enabled. */ private boolean isEducationEnabled() { return Flags.enableDesktopWindowingAppHandleEducation() - || Flags.enableDesktopWindowingAppToWebEducation(); + || Flags.enableDesktopWindowingAppToWebEducationIntegration(); } @Override diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java index e390fbbd751f..c9aa70c3ab16 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java @@ -1429,7 +1429,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { @Test @DisableFlags({Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_HANDLE_EDUCATION, - Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION}) + Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB_EDUCATION_INTEGRATION}) public void notifyCaptionStateChanged_flagDisabled_doNoNotify() { when(DesktopModeStatus.canEnterDesktopMode(mContext)).thenReturn(true); final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); |