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

Commit ab05e3b7 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 QPR1 

Bug: 210511427
Merged-In: I57cf9a80e074b8b9603d38396d111b372fae9737
Change-Id: I870ece9dc6f11a02e2bd5a89fad00f6bf7af0fbc
parents bc4d8174 dd141c62

audio_policy_volumes.xml

+8 −3
Original line number Diff line number Diff line
@@ -153,9 +153,14 @@ volume index from 0 to 100. 
        <point>100,-1800</point>

    </volume>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">

        <point>1,-3100</point>

        <point>71,-2100</point>

        <point>100,-1700</point>

        <point>1,-7000</point>

        <point>14,-5000</point>

        <point>29,-4300</point>

        <point>43,-3700</point>

        <point>57,-3500</point>

        <point>71,-3300</point>

        <point>86,-3100</point>

        <point>100,-2200</point>

    </volume>

    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"

                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml

+2 −3
Original line number Diff line number Diff line
@@ -44,14 +44,13 @@ 
         noisy sensors. -->

    <item name="proximity_sensor_threshold_latch" translatable="false" format="float" type="dimen">24</item>



    <string name="proximity_sensor_secondary_type" translatable="false">com.google.sensor.binned_brightness</string>

    <string name="proximity_sensor_secondary_type" translatable="false">android.sensor.proximity</string>

    <item name="proximity_sensor_secondary_threshold" translatable="false" format="float"

          type="dimen">1</item>

          type="dimen">5</item>



    <!-- Doze: can we assume the pickup sensor includes a proximity check? -->

    <bool name="doze_pickup_performs_proximity_check">true</bool>





    <!-- Doze: only register sensors that use prox when device is in certain Display states. This

     may delay registering sensors when device first shows dozing UI but the

     Display & Power state hasn't changed to low-power mode yet. -->