Evolution-X-Tensor/device_google_raviole
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve merge conflicts of 5e6c470008055c8415eaff5816a8c18bff207c3c to sc-v2-dev

Browse source 
Fix: 192648440
Test: manual
Change-Id: Iae021732381c658f3ec9d8b3c9069810f7263f40
This commit is contained in:
Lais Andrade 2021-07-02 13:28:10 +00:00
commit ab00a09510
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oriole/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -214,4 +214,8 @@
<!-- The max vibration strength allowed in audio haptic channels. --> <!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.3</item> <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.3</item>
<!-- The duration (in milliseconds) that should be applied to waveform vibrations that ends in
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
</resources> </resources>

4
raven/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -169,6 +169,10 @@
<!-- The max vibration strength allowed in audio haptic channels. --> <!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.3</item> <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.3</item>
<!-- The duration (in milliseconds) that should be applied to waveform vibrations that ends in
non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. -->
<integer name="config_vibrationWaveformRampDownDuration">50</integer>
<!-- Height of the status bar in portrait. The height should be <!-- Height of the status bar in portrait. The height should be
Max((status bar content height + waterfall top size), top cutout size) --> Max((status bar content height + waterfall top size), top cutout size) -->
<dimen name="status_bar_height_portrait">145px</dimen> <dimen name="status_bar_height_portrait">145px</dimen>