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

Commit 7940ef5d authored by Xin Li's avatar Xin Li
Browse files

Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 

Bug: 205056467
Merged-In: I5bcbfed8ac4f4eadc62c8661d9e6f9dc01908b1f
Change-Id: Ia593798b44e2cabef963e56f0722a22bd0030011
parents a3d96504 cd67f62c

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. -->