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

Commit 6c1e6ca4 authored by Jason Monk's avatar Jason Monk
Browse files

Disable sounds on menu button 

They are played by the app receiving them when it receives them,
so don't send them as it will cause multiple click sounds.

Test: Auditory
Change-Id: Ib8b977bb775c86eb1fb9ec7426f7d93e399b411e
Fixes: 34099789
parent 76d77937

packages/SystemUI/res/layout/menu_ime.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        android:layout_marginEnd="2dp"

        android:scaleType="centerInside"

        systemui:keyCode="82"

        systemui:playSound="false"

        android:visibility="invisible"

        android:contentDescription="@string/accessibility_menu"

        />

packages/SystemUI/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
        <attr name="keyCode" format="integer" />

        <!-- does this button generate longpress / repeat events? -->

        <attr name="keyRepeat" format="boolean" />

        <!-- Should this button play sound effects, default true -->

        <attr name="playSound" format="boolean" />

        <attr name="android:contentDescription" />

    </declare-styleable>

    <declare-styleable name="ToggleSliderView">

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+4 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import static android.view.accessibility.AccessibilityNodeInfo.ACTION_LONG_CLICK 


public class KeyButtonView extends ImageView implements ButtonInterface {



    private final boolean mPlaySounds;

    private int mContentDescriptionRes;

    private long mDownTime;

    private int mCode;
@@ -90,6 +91,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
        mCode = a.getInteger(R.styleable.KeyButtonView_keyCode, 0);



        mSupportsLongpress = a.getBoolean(R.styleable.KeyButtonView_keyRepeat, true);

        mPlaySounds = a.getBoolean(R.styleable.KeyButtonView_playSound, true);



        TypedValue value = new TypedValue();

        if (a.getValue(R.styleable.KeyButtonView_android_contentDescription, value)) {
@@ -241,8 +243,9 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
    }



    public void playSoundEffect(int soundConstant) {

        if (!mPlaySounds) return;

        mAudioManager.playSoundEffect(soundConstant, ActivityManager.getCurrentUser());

    };

    }



    public void sendEvent(int action, int flags) {

        sendEvent(action, flags, SystemClock.uptimeMillis());