diff options
| -rw-r--r-- | packages/SystemUI/res/layout/menu_ime.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/menu_ime.xml b/packages/SystemUI/res/layout/menu_ime.xml index 6bd79a4b4ae4..8078c4121424 100644 --- a/packages/SystemUI/res/layout/menu_ime.xml +++ b/packages/SystemUI/res/layout/menu_ime.xml @@ -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" /> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index f405943811cf..008fcf0c62b4 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -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"> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java index 882902ee3713..b5d22b1da288 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java @@ -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()); |