Evolution-X-Devices/device_google_bramble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Android 12L

Browse Source 
Bug: 222710654
Merged-In: I2da823e158953eb959ccfcd1bee792fa33fb8885
Change-Id: Icaa4200fcd04f390b674e98e8faf9e08204cd85a
This commit is contained in:
Xin Li
2022-03-08 00:14:53 +00:00
parent 5dbda5bd48 3d6b51cc6f
commit 953ae9d477
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bramble/overlay/frameworks/base/core/res/res/values/config.xml
View File

@@ -211,9 +211,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>
@@ -228,12 +228,10 @@
-->
<dimen name="rounded_corner_radius_adjustment">16px</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 (equal to status bar) -->
<dimen name="quick_qs_offset_height">145px</dimen>
<!-- Height of the status bar.
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
-->
<dimen name="status_bar_height">28dp</dimen>
<!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
@@ -242,4 +240,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>

7
bramble/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
View File

@@ -37,8 +37,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. -->
@@ -86,7 +86,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>

4
device-bramble.mk
View File

@@ -201,7 +201,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PACKAGES += \
NoCutoutOverlay \
AvoidAppsInCutoutOverlay
# (b/183612348): Enable skia reduceOpsTaskSplitting
PRODUCT_PROPERTY_OVERRIDES += \
renderthread.skia.reduceopstasksplitting=true