From adf93a57815e897d64fb6d5286f8b8549d7a69fb Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Wed, 26 Apr 2023 16:03:54 +0800 Subject: [PATCH 1/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 Test: Build, perf metrics Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests Change-Id: I0a032022b80d6171e77ce87c7b09d9aa7c9b3187 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 93952fc..dcf80b2 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 0c25c51..ab95c0b 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 From 61e1cb8b173855b975f1e26897dce312cd3201a9 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Wed, 3 May 2023 16:05:25 +0000 Subject: [PATCH 2/2] Revert "Disable Settings large-screen optimization" Revert submission 22926596-disable_large_screen_opt Reason for revert: b/280606740 Reverted changes: /q/submissionid:22926596-disable_large_screen_opt Change-Id: Iceb14a1ae1006193f9522a7a88e494918c367bb3 --- device-cheetah.mk | 4 ---- device-panther.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index dcf80b2..93952fc 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -376,7 +376,3 @@ 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 ab95c0b..0c25c51 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -359,7 +359,3 @@ 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