diff options
| author | Lais Andrade <lsandrade@google.com> | 2022-01-13 13:52:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-01-13 13:52:55 +0000 |
| commit | 68fe893dd5cf56085b53e62270a90cfa1b4cc1f0 (patch) | |
| tree | e202e82b52bba7a0e77c474ff9029ec2011f9371 /core | |
| parent | 44cd0e46644b792cc7a1340b3bcfc86acd5a8502 (diff) | |
| parent | 3680feb9036378ef1d638f6b248d02401b25b962 (diff) | |
Merge "Move PWLE notification vibration pattern to config.xml" into sc-v2-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 20 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 7bedcc67dc6d..4334476b82a6 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2679,6 +2679,16 @@ <item>350</item> </integer-array> + <!-- A vibration waveform for notifications that specify DEFAULT_VIBRATE. + This value is a float array with values grouped as + { targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) } + This is only applied on devices with vibration frequency control. If the device doesn't + support frequency control, then the vibration specified in + config_defaultNotificationVibePattern is used instead. + --> + <array name="config_defaultNotificationVibeWaveform"> + </array> + <!-- Vibrator pattern to be used as the default for notifications that do not specify vibration but vibrate anyway because the device is in vibrate mode. @@ -2690,6 +2700,16 @@ <item>100</item> </integer-array> + <!-- A vibration waveform for notifications that do not specify vibration but vibrate anyway, + because the device is in vibrate mode. This value is a float array with values grouped as + { targetAmplitude (within [0,1]), targetFrequency [-1,1], duration (in milliseconds) } + This is only applied on devices with vibration frequency control. If the device doesn't + support frequency control, then the vibration specified in + config_notificationFallbackVibePattern is used instead. + --> + <array name="config_notificationFallbackVibeWaveform"> + </array> + <!-- Flag indicating if the speed up audio on mt call code should be executed --> <bool name="config_speed_up_audio_on_mt_calls">false</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 46b249e5be6d..1a215b6696a9 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1917,7 +1917,9 @@ <java-symbol type="array" name="config_locationExtraPackageNames" /> <java-symbol type="array" name="config_testLocationProviders" /> <java-symbol type="array" name="config_defaultNotificationVibePattern" /> + <java-symbol type="array" name="config_defaultNotificationVibeWaveform" /> <java-symbol type="array" name="config_notificationFallbackVibePattern" /> + <java-symbol type="array" name="config_notificationFallbackVibeWaveform" /> <java-symbol type="bool" name="config_enableServerNotificationEffectsForAutomotive" /> <java-symbol type="bool" name="config_useAttentionLight" /> <java-symbol type="bool" name="config_adaptive_sleep_available" /> |