drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable sounds on menu button" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-03 16:37:44 +00:00
committed by Android (Google) Code Review
parent cb4ed821f2 6c1e6ca48e
commit 5c8832a983
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/menu_ime.xml
View File

@ -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"
/>

2
packages/SystemUI/res/values/attrs.xml
View File

@ -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">

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

@ -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());