diff options
| author | Yeabkal Wubshit <yeabkal@google.com> | 2023-11-30 19:30:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-30 19:30:19 +0000 |
| commit | 885d79344d58a23c11b16db29140f410ba0a2ef6 (patch) | |
| tree | 1cf93d07f09d59c9cd3ce1742f856e09bfa98abd | |
| parent | 536e300f9d6dd197b6eda42c806a8b33f3091cb5 (diff) | |
| parent | a9f2606c4138c0c99e10c05ee4a26f86bedb765d (diff) | |
| download | Telecomm-885d79344d58a23c11b16db29140f410ba0a2ef6.tar.gz | |
Merge "Update <vibration> to <vibration-effect>" into main
| -rw-r--r-- | tests/src/com/android/server/telecom/tests/RingerTest.java | 20 |
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( |