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 am: b830e35b98 am: 0c968ecd66

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15175173

Change-Id: I4bfa47f905bfe7dd262af13d7e8c968be229076f
This commit is contained in:
Lais Andrade 2021-07-02 16:07:23 +00:00 • committed by Automerger Merge Worker
commit 633835a19b
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>