Merge "Inline usages of LOCAL_STEM" am: b2f8d5c2e6 am: 286d03fad2 am: b9b64916cc
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/1930925
Change-Id: If1392df8add698c10a4a57a57845b81fe28750d3
diff --git a/device-redfin.mk b/device-redfin.mk
index df1b668..789eae4 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -235,10 +235,6 @@
NoCutoutOverlay \
AvoidAppsInCutoutOverlay
-# (b/183612348): Enable skia reduceOpsTaskSplitting
-PRODUCT_PROPERTY_OVERRIDES += \
- renderthread.skia.reduceopstasksplitting=true
-
# Include the redfin product FCM.
# Vendor Freeze system-only builds use a different FCM.
ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)
diff --git a/redfin/overlay/frameworks/base/core/res/res/values/config.xml b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
index d280189..a2ac121 100755
--- a/redfin/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
@@ -218,9 +218,9 @@
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
M 0.0,0.0
- h 136
+ h 145
v 136
- h -136
+ h -145
Z
@left
</string>
@@ -234,12 +234,10 @@
rounded_corner_radius to more accurately provide a "radius" for the rounded corners.-->
<dimen name="rounded_corner_radius_adjustment">8px</dimen>
- <!-- Height of the status bar in portrait. The height should be
- Max((status bar content height + waterfall top size), top cutout size) -->
- <dimen name="status_bar_height_portrait">145px</dimen>
- <dimen name="status_bar_height_landscape">28dp</dimen>
- <!-- Height of area above QQS where battery/time go (48dp to reduce scrolling) -->
- <dimen name="quick_qs_offset_height">48dp</dimen>
+ <!-- Height of the status bar.
+ Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+ -->
+ <dimen name="status_bar_height">28dp</dimen>
<!-- Not allow to switch to higher refresh rate when display brightness setting is
equal or less than this value -->
@@ -275,4 +273,7 @@
<string-array name="config_biometric_sensors" translatable="false" >
<item>0:2:15</item> <!-- ID0:Fingerprint:Strong -->
</string-array>
+
+ <!-- the number of the max cached processes in the system. -->
+ <integer name="config_customizedMaxCachedProcesses">64</integer>
</resources>
diff --git a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index d2dd6db..1dcedb0 100644
--- a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -59,8 +59,8 @@
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
- <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
- <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
+ <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
to brightness values; -1 means keeping the current brightness. -->
@@ -109,7 +109,4 @@
<string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string>
<bool name="config_enableDisplayCutoutProtection">true</bool>
-
- <!-- Whether global actions should show an informational message about changes in S -->
- <bool name="global_actions_show_change_info">true</bool>
</resources>
