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

Commit 1fa4481d authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents 9778f006 ed631e82

packages/SystemUI/res/values/lineage_config.xml

+3 −0
Original line number Diff line number Diff line
@@ -70,4 +70,7 @@ 
         Possible values: 3, 3.1, 3.2, 4, 4.1, 4.2

    -->

    <string name="config_screenRecorderAVCProfileLevel" translatable="false">4.2</string>



    <!-- Whether to play turbulence noise after clicking the play button -->

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

</resources>

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java

+2 −1
Original line number Diff line number Diff line
@@ -646,7 +646,8 @@ public class MediaControlPanel { 
                        mLoadingEffect::finish,

                        TURBULENCE_NOISE_PLAY_DURATION

                );

            } else {

            } else if (mContext.getResources().getBoolean(

                    com.android.systemui.res.R.bool.config_turbulenceNoise)) {

                mTurbulenceNoiseController.play(

                        Type.SIMPLEX_NOISE,

                        mTurbulenceNoiseAnimationConfig