Rename shouldUseDefaultDeviceStateChangeTransition attribute
Renames the shouldUseDefaultDeviceStateChangeTransition attribute name to
shouldUseDefaultDisplayStateChangeTransition to make it less generic.
Test: manual
Fixes: 200698833
Change-Id: I48b52b08b86007a17b2ea2d92d152e85f4b8a517
diff --git a/tests/app/app/res/xml/wallpaper.xml b/tests/app/app/res/xml/wallpaper.xml
index faca1d2..afb8708 100644
--- a/tests/app/app/res/xml/wallpaper.xml
+++ b/tests/app/app/res/xml/wallpaper.xml
@@ -21,7 +21,7 @@
android:description="@string/wallpaper_description"
android:showMetadataInPreview="true"
android:supportsMultipleDisplays="true"
- android:shouldUseDefaultDeviceStateChangeTransition="true"
+ android:shouldUseDefaultDisplayStateChangeTransition="true"
android:contextDescription="@string/wallpaper_context"
android:contextUri="@string/wallpaper_context_uri"
android:settingsSliceUri="@string/wallpaper_slice_uri"
diff --git a/tests/app/app/res/xml/wallpaper_no_default_device_state_change_transition.xml b/tests/app/app/res/xml/wallpaper_no_default_device_state_change_transition.xml
index e3c8ec0..5167cc5 100644
--- a/tests/app/app/res/xml/wallpaper_no_default_device_state_change_transition.xml
+++ b/tests/app/app/res/xml/wallpaper_no_default_device_state_change_transition.xml
@@ -19,5 +19,5 @@
android:thumbnail="@drawable/icon_red"
android:author="@string/wallpaper_collection"
android:description="@string/wallpaper_description"
- android:shouldUseDefaultDeviceStateChangeTransition="false"
+ android:shouldUseDefaultDisplayStateChangeTransition="false"
/>
diff --git a/tests/app/src/android/app/cts/WallpaperInfoTest.java b/tests/app/src/android/app/cts/WallpaperInfoTest.java
index 911be41..b82c3ba 100644
--- a/tests/app/src/android/app/cts/WallpaperInfoTest.java
+++ b/tests/app/src/android/app/cts/WallpaperInfoTest.java
@@ -74,16 +74,16 @@
wallpaperInfo.getSettingsSliceUri().toString());
assertTrue(wallpaperInfo.getShowMetadataInPreview());
assertTrue(wallpaperInfo.supportsMultipleDisplays());
- assertTrue(wallpaperInfo.shouldUseDefaultDeviceStateChangeTransition());
+ assertTrue(wallpaperInfo.shouldUseDefaultDisplayStateChangeTransition());
assertNotNull(wallpaperInfo.loadIcon(pm));
assertNotNull(wallpaperInfo.loadThumbnail(pm));
}
@Test
- public void test_defaultDeviceStateChangeTransitionDisabled() {
+ public void test_defaultDisplayStateChangeTransitionDisabled() {
WallpaperInfo wallpaperInfo = getInfoForService(LiveWallpaperNoUnfoldTransition.class);
- assertFalse(wallpaperInfo.shouldUseDefaultDeviceStateChangeTransition());
+ assertFalse(wallpaperInfo.shouldUseDefaultDisplayStateChangeTransition());
}
private <T extends WallpaperService> WallpaperInfo getInfoForService(Class<T> service) {