From 653f25765f6504046710426ec288fa63ad400732 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Thu, 4 May 2023 18:30:48 +0000 Subject: [PATCH] Revert^2 Disable Settings large-screen optimization Disable the optimization that is automatically enabled when including Window Extensions through Activity Embedding. The optimization causes to launch an additional trampoline activity for deep links, even when the screen size is smaller than required by Activity Embedding rules. Bug: 267725145 Bug: 279461170 fixes: 280606740 Test: Build, perf metrics Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests Test: atest SettingsMultiPaneDeepLinkTest.java Test: run v2/aep-ironwood/suite/test-mapping-ironwood-p0-cujs via ABTD on cheetah/oriole/panther/raven in udc-dev/master branch Change-Id: I532ebbcdc93f13c8d4cf956b53b498be907c4349 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 997f061..e1f5e13 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -376,3 +376,7 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false diff --git a/device-panther.mk b/device-panther.mk index 20363ad..21e2f75 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -359,3 +359,7 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false