From 0337a84b9f87bb784dee8bc49c9bff6bff03a82a Mon Sep 17 00:00:00 2001
From: Richard Chang <richardycc@google.com>
Date: Mon, 15 May 2023 02:29:10 +0000
Subject: [PATCH 1/2] raviole: remove customizedMaxCachedProcesses

With project Snowbird in U, the MaxCachedProcesses is 1024 by default

Bug: 278086134
Test: Build
Change-Id: I9672bc93d6212bee842c7a86a351d4e286eeda67
---
 oriole/overlay/frameworks/base/core/res/res/values/config.xml | 3 ---
 raven/overlay/frameworks/base/core/res/res/values/config.xml  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 67405dd..c280a88 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -224,9 +224,6 @@
          non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
     <integer name="config_vibrationWaveformRampDownDuration">50</integer>
 
-    <!-- the number of the max cached processes in the system. -->
-    <integer name="config_customizedMaxCachedProcesses">64</integer>
-
 <integer-array name="config_ambientThresholdLevels">
     <item>2</item>
     <item>3</item>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 1a78f19..c8d8730 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -200,9 +200,6 @@
     <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
     <bool name="config_faceAuthDismissesKeyguard">false</bool>
 
-    <!-- the number of the max cached processes in the system. -->
-    <integer name="config_customizedMaxCachedProcesses">64</integer>
-
 <integer-array name="config_ambientThresholdLevels">
     <item>2</item>
     <item>3</item>

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 2/2] 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
+