From 9e53e0ec95154d5ed6bfd04b72ff2bf5d7a2deb3 Mon Sep 17 00:00:00 2001
From: Jiaming Liu <jiamingliu@google.com>
Date: Fri, 12 May 2023 01:36:04 +0000
Subject: [PATCH] Revert "Disable WM Extensions on Pixel 6"

This reverts commit e81ae9f5e14ae9f3d87ac9bfa2456d69edf86d92.

Reason for revert: Re-enable for U QPR

Bug: 266196089

Change-Id: I9fdca6644ee7302f52fe3b850a357bae76dbacf3
---
 device-oriole.mk | 8 ++++++++
 device-raven.mk  | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/device-oriole.mk b/device-oriole.mk
index e7d8fd7..f01655c 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -271,3 +271,11 @@ else
         PRODUCT_COPY_FILES += \
 		device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
+
+# 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-raven.mk b/device-raven.mk
index fffcbfc..a926be3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -290,3 +290,11 @@ else
         PRODUCT_COPY_FILES += \
 		device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
+
+# 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
+