Merge SP2A.220505.002
Bug: 231319788 Merged-In: Iff092322df7a366281dcf89d8c9987064b6347f8 Change-Id: Ia64f524afce21cb5fde0e2c9f92fbd5da43388db
This commit is contained in:
commit
ea34fafe0d
4 changed files with 2 additions and 166 deletions
|
@ -171,7 +171,7 @@ endif
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=24
|
||||
ro.vendor.build.svn=25
|
||||
|
||||
# Hide cutout overlays
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
|
@ -183,7 +183,7 @@ endif
|
|||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=24
|
||||
ro.vendor.build.svn=25
|
||||
|
||||
# Hide cutout overlays
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
|
@ -227,88 +227,6 @@
|
|||
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
|
||||
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
|
||||
|
||||
<!-- 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">
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>0.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>100.0</item>
|
||||
</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">
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>0.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>50.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>50.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>50.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>50.0</item>
|
||||
</array>
|
||||
|
||||
<!-- the number of the max cached processes in the system. -->
|
||||
<integer name="config_customizedMaxCachedProcesses">64</integer>
|
||||
</resources>
|
||||
|
|
|
@ -195,88 +195,6 @@
|
|||
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
|
||||
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
|
||||
|
||||
<!-- 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">
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>0.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>100.0</item>
|
||||
</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">
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>0.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>50.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>50.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>50.0</item>
|
||||
|
||||
<item>0.4</item>
|
||||
<item>-0.25</item>
|
||||
<item>100.0</item>
|
||||
|
||||
<item>0.0</item>
|
||||
<item>-0.85</item>
|
||||
<item>50.0</item>
|
||||
</array>
|
||||
|
||||
<!-- Height of the status bar.
|
||||
Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
|
||||
-->
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue