Merge "Revert "shusky/haptics: Remove voltage restriction for haptics"" into main

This commit is contained in:
Treehugger Robot 2024-12-05 22:15:01 +00:00 committed by Android (Google) Code Review
commit 7887236511
3 changed files with 8 additions and 0 deletions

View file

@ -300,6 +300,9 @@
<bool name="config_safe_sound_dosage_enabled">true</bool>
<!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
<!-- The maximum range of gamma adjustment possible using the screen
auto-brightness adjustment setting. -->
<fraction name="config_autoBrightnessAdjustmentMaxGamma">105%</fraction>

View file

@ -231,4 +231,6 @@
<item>283</item>
</integer-array>
<!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
</resources>

View file

@ -294,6 +294,9 @@
<bool name="config_safe_sound_dosage_enabled">true</bool>
<!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
<!-- The maximum range of gamma adjustment possible using the screen
auto-brightness adjustment setting. -->
<fraction name="config_autoBrightnessAdjustmentMaxGamma">105%</fraction>