Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57e0210a authored by Xin Li's avatar Xin Li
Browse files

Merge sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I37a8e621c2e06e41e29076b1671e525b53810bde
Change-Id: Id502f1a1ea41049c2c0d39b80073745d3a90bec4
parents 286d03fa 52df4a7b
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -235,10 +235,6 @@ PRODUCT_PACKAGES += \
    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)
+9 −8
Original line number Diff line number Diff line
@@ -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>
+2 −5
Original line number Diff line number Diff line
@@ -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>
+1 −0
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ bpeckham@google.com
chrisgross@google.com
danielnorman@google.com
inseob@google.com
jjdemartino@google.com
justinyun@google.com