From 5985d390d6d38c143a5174c659e81ddc05135b45 Mon Sep 17 00:00:00 2001 From: Nick Chameyev Date: Thu, 30 Sep 2021 10:49:09 +0000 Subject: [PATCH] Rename shouldUseDefaultDeviceStateChangeTransition attribute Renames the shouldUseDefaultDeviceStateChangeTransition attribute name to shouldUseDefaultDisplayStateChangeTransition to make it less generic. Test: manual Fixes: 200698833 Change-Id: Ib6f90bcba2e75485e954bdbc1833fd67728e51c6 --- core/api/current.txt | 4 ++-- core/java/android/app/WallpaperInfo.java | 22 +++++++++---------- core/res/res/values/attrs.xml | 8 +++---- core/res/res/values/public.xml | 2 +- .../systemui/util/WallpaperController.kt | 6 ++--- .../systemui/util/WallpaperControllerTest.kt | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 9a16390baf10a..1d03370e698d8 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -1298,7 +1298,7 @@ package android { field public static final int shortcutLongLabel = 16844074; // 0x101052a field public static final int shortcutShortLabel = 16844073; // 0x1010529 field public static final int shouldDisableView = 16843246; // 0x10101ee - field public static final int shouldUseDefaultDeviceStateChangeTransition; + field public static final int shouldUseDefaultDisplayStateChangeTransition; field public static final int showAsAction = 16843481; // 0x10102d9 field public static final int showDefault = 16843258; // 0x10101fa field public static final int showDividers = 16843561; // 0x1010329 @@ -6927,7 +6927,7 @@ package android.app { method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager); method public CharSequence loadLabel(android.content.pm.PackageManager); method public android.graphics.drawable.Drawable loadThumbnail(android.content.pm.PackageManager); - method public boolean shouldUseDefaultDeviceStateChangeTransition(); + method public boolean shouldUseDefaultDisplayStateChangeTransition(); method public boolean supportsMultipleDisplays(); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; diff --git a/core/java/android/app/WallpaperInfo.java b/core/java/android/app/WallpaperInfo.java index c552cb62749b2..a969b10c15a31 100644 --- a/core/java/android/app/WallpaperInfo.java +++ b/core/java/android/app/WallpaperInfo.java @@ -81,7 +81,7 @@ public final class WallpaperInfo implements Parcelable { final int mContextDescriptionResource; final boolean mShowMetadataInPreview; final boolean mSupportsAmbientMode; - final boolean mShouldUseDefaultDeviceStateChangeTransition; + final boolean mShouldUseDefaultDisplayStateChangeTransition; final String mSettingsSliceUri; final boolean mSupportMultipleDisplays; @@ -146,9 +146,9 @@ public final class WallpaperInfo implements Parcelable { mSupportsAmbientMode = sa.getBoolean( com.android.internal.R.styleable.Wallpaper_supportsAmbientMode, false); - mShouldUseDefaultDeviceStateChangeTransition = sa.getBoolean( + mShouldUseDefaultDisplayStateChangeTransition = sa.getBoolean( com.android.internal.R.styleable - .Wallpaper_shouldUseDefaultDeviceStateChangeTransition, true); + .Wallpaper_shouldUseDefaultDisplayStateChangeTransition, true); mSettingsSliceUri = sa.getString( com.android.internal.R.styleable.Wallpaper_settingsSliceUri); mSupportMultipleDisplays = sa.getBoolean( @@ -175,7 +175,7 @@ public final class WallpaperInfo implements Parcelable { mSupportsAmbientMode = source.readInt() != 0; mSettingsSliceUri = source.readString(); mSupportMultipleDisplays = source.readInt() != 0; - mShouldUseDefaultDeviceStateChangeTransition = source.readInt() != 0; + mShouldUseDefaultDisplayStateChangeTransition = source.readInt() != 0; mService = ResolveInfo.CREATOR.createFromParcel(source); } @@ -400,24 +400,24 @@ public final class WallpaperInfo implements Parcelable { /** * Returns whether this wallpaper should receive default zooming updates when the device - * changes its state (e.g. when folding or unfolding a foldable device). + * changes its display state (e.g. when folding or unfolding a foldable device). * If set to false the wallpaper will not receive zoom events when changing the device state, * so it can implement its own transition instead. *

* This corresponds to the value {@link - * android.R.styleable#Wallpaper_shouldUseDefaultDeviceStateChangeTransition} in the + * android.R.styleable#Wallpaper_shouldUseDefaultDisplayStateChangeTransition} in the * XML description of the wallpaper. *

* The default value is {@code true}. * - * @see android.R.styleable#Wallpaper_shouldUseDefaultDeviceStateChangeTransition + * @see android.R.styleable#Wallpaper_shouldUseDefaultDisplayStateChangeTransition * @return {@code true} if wallpaper should receive default device state change * transition updates * - * @attr ref android.R.styleable#Wallpaper_shouldUseDefaultDeviceStateChangeTransition + * @attr ref android.R.styleable#Wallpaper_shouldUseDefaultDisplayStateChangeTransition */ - public boolean shouldUseDefaultDeviceStateChangeTransition() { - return mShouldUseDefaultDeviceStateChangeTransition; + public boolean shouldUseDefaultDisplayStateChangeTransition() { + return mShouldUseDefaultDisplayStateChangeTransition; } public void dump(Printer pw, String prefix) { @@ -450,7 +450,7 @@ public final class WallpaperInfo implements Parcelable { dest.writeInt(mSupportsAmbientMode ? 1 : 0); dest.writeString(mSettingsSliceUri); dest.writeInt(mSupportMultipleDisplays ? 1 : 0); - dest.writeInt(mShouldUseDefaultDeviceStateChangeTransition ? 1 : 0); + dest.writeInt(mShouldUseDefaultDisplayStateChangeTransition ? 1 : 0); mService.writeToParcel(dest, flags); } diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 53396407904a3..77820d1dfa382 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -8372,8 +8372,8 @@ - + {@link android.app.WallpaperInfo#shouldUseDefaultDisplayStateChangeTransition()} --> + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index e17daf09e4da6..462b1883e29d6 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3221,7 +3221,7 @@ - + diff --git a/packages/SystemUI/src/com/android/systemui/util/WallpaperController.kt b/packages/SystemUI/src/com/android/systemui/util/WallpaperController.kt index a9810458fe90d..2c01a7003a16f 100644 --- a/packages/SystemUI/src/com/android/systemui/util/WallpaperController.kt +++ b/packages/SystemUI/src/com/android/systemui/util/WallpaperController.kt @@ -40,8 +40,8 @@ class WallpaperController @Inject constructor(private val wallpaperManager: Wall this.wallpaperInfo = wallpaperInfo } - private val shouldUseDefaultDeviceStateChangeTransition: Boolean - get() = wallpaperInfo?.shouldUseDefaultDeviceStateChangeTransition() + private val shouldUseDefaultDisplayStateChangeTransition: Boolean + get() = wallpaperInfo?.shouldUseDefaultDisplayStateChangeTransition() ?: true fun setNotificationShadeZoom(zoomOut: Float) { @@ -50,7 +50,7 @@ class WallpaperController @Inject constructor(private val wallpaperManager: Wall } fun setUnfoldTransitionZoom(zoomOut: Float) { - if (shouldUseDefaultDeviceStateChangeTransition) { + if (shouldUseDefaultDisplayStateChangeTransition) { unfoldTransitionZoomOut = zoomOut updateZoom() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/WallpaperControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/util/WallpaperControllerTest.kt index de86821c05356..b54aadb8228fa 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/WallpaperControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/util/WallpaperControllerTest.kt @@ -138,7 +138,7 @@ class WallpaperControllerTest : SysuiTestCase() { private fun createWallpaperInfo(useDefaultTransition: Boolean = true): WallpaperInfo { val info = mock(WallpaperInfo::class.java) - whenever(info.shouldUseDefaultDeviceStateChangeTransition()) + whenever(info.shouldUseDefaultDisplayStateChangeTransition()) .thenReturn(useDefaultTransition) return info }