summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeabkal Wubshit <yeabkal@google.com>2023-11-28 21:47:35 -0800
committerYeabkal Wubshit <yeabkal@google.com>2023-11-29 05:59:23 +0000
commita9f2606c4138c0c99e10c05ee4a26f86bedb765d (patch)
tree0c693a3986f45d6bba31ad275c34e74f7c2b4729
parent5e141f9d4516c1eddb7827e6a9b93107d659a9f7 (diff)
downloadTelecomm-a9f2606c4138c0c99e10c05ee4a26f86bedb765d.tar.gz
Update <vibration> to <vibration-effect>
See bug for details. `use_device_provided_serialized_ringer_vibration` flags default vibration customization support for Ringer; no new flag is created. Bug: 297296718 Test: presubmit Change-Id: Ib613c55347a9eded89deaf4674a9583717cdf969
-rw-r--r--tests/src/com/android/server/telecom/tests/RingerTest.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/src/com/android/server/telecom/tests/RingerTest.java b/tests/src/com/android/server/telecom/tests/RingerTest.java
index 985438409..ee42c2af7 100644
--- a/tests/src/com/android/server/telecom/tests/RingerTest.java
+++ b/tests/src/com/android/server/telecom/tests/RingerTest.java
@@ -182,9 +182,9 @@ public class RingerTest extends TelecomTestCase {
when(mFeatureFlags.useDeviceProvidedSerializedRingerVibration()).thenReturn(true);
mockVibrationResourceValues(
"""
- <vibration>
+ <vibration-effect>
<predefined-effect name="click"/>
- </vibration>
+ </vibration-effect>
""",
/* useSimpleVibration= */ true);
when(mockVibratorInfo.areVibrationFeaturesSupported(any())).thenReturn(true);
@@ -201,7 +201,7 @@ public class RingerTest extends TelecomTestCase {
when(mFeatureFlags.useDeviceProvidedSerializedRingerVibration()).thenReturn(false);
mockVibrationResourceValues(
"""
- <vibration>
+ <vibration-effect>
<waveform-effect>
<waveform-entry durationMs="100" amplitude="0"/>
<repeating>
@@ -209,7 +209,7 @@ public class RingerTest extends TelecomTestCase {
<waveform-entry durationMs="700" amplitude="0"/>
</repeating>
</waveform-effect>
- </vibration>
+ </vibration-effect>
""",
/* useSimpleVibration= */ false);
when(mockVibratorInfo.areVibrationFeaturesSupported(any())).thenReturn(true);
@@ -225,7 +225,7 @@ public class RingerTest extends TelecomTestCase {
when(mFeatureFlags.useDeviceProvidedSerializedRingerVibration()).thenReturn(true);
mockVibrationResourceValues(
"""
- <vibration>
+ <vibration-effect>
<waveform-effect>
<waveform-entry durationMs="100" amplitude="0"/>
<repeating>
@@ -233,7 +233,7 @@ public class RingerTest extends TelecomTestCase {
<waveform-entry durationMs="700" amplitude="0"/>
</repeating>
</waveform-effect>
- </vibration>
+ </vibration-effect>
""",
/* useSimpleVibration= */ false);
when(mockVibratorInfo.areVibrationFeaturesSupported(any())).thenReturn(true);
@@ -251,9 +251,9 @@ public class RingerTest extends TelecomTestCase {
when(mFeatureFlags.useDeviceProvidedSerializedRingerVibration()).thenReturn(true);
mockVibrationResourceValues(
"""
- <vibration>
+ <vibration-effect>
<predefined-effect name="click"/>
- </vibration>
+ </vibration-effect>
""",
/* useSimpleVibration= */ false);
when(mockVibratorInfo.areVibrationFeaturesSupported(any())).thenReturn(true);
@@ -280,9 +280,9 @@ public class RingerTest extends TelecomTestCase {
when(mFeatureFlags.useDeviceProvidedSerializedRingerVibration()).thenReturn(true);
mockVibrationResourceValues(
"""
- <vibration>
+ <vibration-effect>
<predefined-effect name="click"/>
- </vibration>
+ </vibration-effect>
""",
/* useSimpleVibration= */ false);
when(mockVibratorInfo.areVibrationFeaturesSupported(