Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create a new config for attentional haptics OGG resource" into sc-dev am: c7aa640da3 am: e2f1488247

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14253109

Change-Id: I92003dec65c6374b7ef911f1ed8aae60ca16e652
This commit is contained in:
TreeHugger Robot
2021-05-25 14:43:31 +00:00
committed by Automerger Merge Worker
parent 741c0ca2fe e2f1488247
commit 587cd8f655
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -3971,6 +3971,9 @@
<!-- URI for in call notification sound --> <!-- URI for in call notification sound -->
<string translatable="false" name="config_inCallNotificationSound">/product/media/audio/ui/InCallNotification.ogg</string> <string translatable="false" name="config_inCallNotificationSound">/product/media/audio/ui/InCallNotification.ogg</string>
<!-- URI for default ringtone sound file to be used for silent ringer vibration -->
<string translatable="false" name="config_defaultRingtoneVibrationSound">/product/media/audio/ui/AttentionalHaptics.ogg</string>
<!-- Default number of notifications from the same app before they are automatically grouped by the OS --> <!-- Default number of notifications from the same app before they are automatically grouped by the OS -->
<integer translatable="false" name="config_autoGroupAtCount">4</integer> <integer translatable="false" name="config_autoGroupAtCount">4</integer>

2
core/res/res/values/public.xml
View File

@@ -3236,6 +3236,8 @@
<public name="config_systemCompanionDeviceProvider"/> <public name="config_systemCompanionDeviceProvider"/>
<!-- @hide @SystemApi --> <!-- @hide @SystemApi -->
<public name="config_systemUi" /> <public name="config_systemUi" />
<!-- @hide For use by platform and tools only. Developers should not specify this value. -->
<public name="config_defaultRingtoneVibrationSound"/>
</staging-public-group> </staging-public-group>
<staging-public-group type="id" first-id="0x01020055"> <staging-public-group type="id" first-id="0x01020055">

8
media/java/android/media/Ringtone.java
View File

@@ -405,9 +405,11 @@ public class Ringtone {
*/ */
public void play() { public void play() {
if (mLocalPlayer != null) { if (mLocalPlayer != null) {
// do not play ringtones if stream volume is 0 // Play ringtones if stream volume is over 0 or if it is a haptic-only ringtone
// (typically because ringer mode is silent). // (typically because ringer mode is vibrate).
if (mAudioManager.getStreamVolume( boolean isHapticOnly = AudioManager.hasHapticChannels(mUri)
&& !mAudioAttributes.areHapticChannelsMuted() && mVolume == 0;
if (isHapticOnly || mAudioManager.getStreamVolume(
AudioAttributes.toLegacyStreamType(mAudioAttributes)) != 0) { AudioAttributes.toLegacyStreamType(mAudioAttributes)) != 0) {
startLocalPlayer(); startLocalPlayer();
} }