From caf226bfb093e7f19e5ed5a6481431c3ff37097a Mon Sep 17 00:00:00 2001 From: Nick Chameyev Date: Wed, 18 Aug 2021 17:22:18 +0100 Subject: [PATCH] Update unfold transition package name These changes contain only updating of the package name. Changing it to more specific package name in order to not confuse with Android SDK classes. Bug: 190818044 Test: manual Change-Id: Id9d88b9d51c8033387f693fc96ed97651b535f6c --- .../animation/UnfoldMoveFromCenterAnimator.kt | 2 +- .../unfold/UnfoldTransitionFactory.kt | 20 +++++++++---------- .../UnfoldTransitionProgressProvider.kt | 4 ++-- .../config/ResourceUnfoldTransitionConfig.kt | 2 +- .../unfold/config/UnfoldTransitionConfig.kt | 2 +- .../FixedTimingTransitionProgressProvider.kt | 14 ++++++------- ...csBasedUnfoldTransitionProgressProvider.kt | 18 ++++++++--------- .../unfold/updates/DeviceFoldStateProvider.kt | 12 +++++------ .../unfold/updates/FoldStateProvider.kt | 4 ++-- .../updates/hinge/EmptyHingeAngleProvider.kt | 2 +- .../updates/hinge/HingeAngleProvider.kt | 2 +- .../hinge/RotationSensorHingeAngleProvider.kt | 2 +- .../updates/screen/ScreenStatusProvider.kt | 4 ++-- .../systemui/dagger/DependencyProvider.java | 6 +++--- .../keyguard/LifecycleScreenStatusProvider.kt | 4 ++-- .../systemui/statusbar/phone/StatusBar.java | 2 +- .../phone/dagger/StatusBarPhoneModule.java | 2 +- .../UnfoldLightRevealOverlayAnimation.kt | 3 +-- .../statusbar/phone/StatusBarTest.java | 2 +- 19 files changed, 53 insertions(+), 54 deletions(-) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/UnfoldTransitionFactory.kt (75%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/UnfoldTransitionProgressProvider.kt (91%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/config/ResourceUnfoldTransitionConfig.kt (97%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/config/UnfoldTransitionConfig.kt (96%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/progress/FixedTimingTransitionProgressProvider.kt (87%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt (89%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/updates/DeviceFoldStateProvider.kt (90%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/updates/FoldStateProvider.kt (93%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/updates/hinge/EmptyHingeAngleProvider.kt (85%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/updates/hinge/HingeAngleProvider.kt (85%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/updates/hinge/RotationSensorHingeAngleProvider.kt (97%) rename packages/SystemUI/shared/src/com/android/{ => systemui}/unfold/updates/screen/ScreenStatusProvider.kt (87%) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt index 4bb4eb9c020ea..915e7f63ffb22 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/animation/UnfoldMoveFromCenterAnimator.kt @@ -20,7 +20,7 @@ import android.util.MathUtils.lerp import android.view.Surface import android.view.View import android.view.WindowManager -import com.android.unfold.UnfoldTransitionProgressProvider +import com.android.systemui.unfold.UnfoldTransitionProgressProvider import java.lang.ref.WeakReference /** diff --git a/packages/SystemUI/shared/src/com/android/unfold/UnfoldTransitionFactory.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt similarity index 75% rename from packages/SystemUI/shared/src/com/android/unfold/UnfoldTransitionFactory.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt index 7594f50718993..9b5eae8f6c265 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/UnfoldTransitionFactory.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionFactory.kt @@ -15,21 +15,21 @@ */ @file:JvmName("UnfoldTransitionFactory") -package com.android.unfold +package com.android.systemui.unfold import android.content.Context import android.hardware.SensorManager import android.hardware.devicestate.DeviceStateManager import android.os.Handler -import com.android.unfold.updates.screen.ScreenStatusProvider -import com.android.unfold.config.ANIMATION_MODE_HINGE_ANGLE -import com.android.unfold.config.ResourceUnfoldTransitionConfig -import com.android.unfold.config.UnfoldTransitionConfig -import com.android.unfold.progress.FixedTimingTransitionProgressProvider -import com.android.unfold.progress.PhysicsBasedUnfoldTransitionProgressProvider -import com.android.unfold.updates.DeviceFoldStateProvider -import com.android.unfold.updates.hinge.EmptyHingeAngleProvider -import com.android.unfold.updates.hinge.RotationSensorHingeAngleProvider +import com.android.systemui.unfold.updates.screen.ScreenStatusProvider +import com.android.systemui.unfold.config.ANIMATION_MODE_HINGE_ANGLE +import com.android.systemui.unfold.config.ResourceUnfoldTransitionConfig +import com.android.systemui.unfold.config.UnfoldTransitionConfig +import com.android.systemui.unfold.progress.FixedTimingTransitionProgressProvider +import com.android.systemui.unfold.progress.PhysicsBasedUnfoldTransitionProgressProvider +import com.android.systemui.unfold.updates.DeviceFoldStateProvider +import com.android.systemui.unfold.updates.hinge.EmptyHingeAngleProvider +import com.android.systemui.unfold.updates.hinge.RotationSensorHingeAngleProvider import java.lang.IllegalStateException import java.util.concurrent.Executor diff --git a/packages/SystemUI/shared/src/com/android/unfold/UnfoldTransitionProgressProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionProgressProvider.kt similarity index 91% rename from packages/SystemUI/shared/src/com/android/unfold/UnfoldTransitionProgressProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionProgressProvider.kt index 4a6a9ac266f25..e17f43e64b215 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/UnfoldTransitionProgressProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/UnfoldTransitionProgressProvider.kt @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.unfold +package com.android.systemui.unfold import android.annotation.FloatRange -import com.android.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener +import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener import com.android.systemui.statusbar.policy.CallbackController /** diff --git a/packages/SystemUI/shared/src/com/android/unfold/config/ResourceUnfoldTransitionConfig.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/config/ResourceUnfoldTransitionConfig.kt similarity index 97% rename from packages/SystemUI/shared/src/com/android/unfold/config/ResourceUnfoldTransitionConfig.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/config/ResourceUnfoldTransitionConfig.kt index bde87a57b3aac..fa6b5de0b1ee6 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/config/ResourceUnfoldTransitionConfig.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/config/ResourceUnfoldTransitionConfig.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.unfold.config +package com.android.systemui.unfold.config import android.content.Context import android.os.SystemProperties diff --git a/packages/SystemUI/shared/src/com/android/unfold/config/UnfoldTransitionConfig.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/config/UnfoldTransitionConfig.kt similarity index 96% rename from packages/SystemUI/shared/src/com/android/unfold/config/UnfoldTransitionConfig.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/config/UnfoldTransitionConfig.kt index f000c69ac809b..75d9dc32339f5 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/config/UnfoldTransitionConfig.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/config/UnfoldTransitionConfig.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.unfold.config +package com.android.systemui.unfold.config import android.annotation.IntDef diff --git a/packages/SystemUI/shared/src/com/android/unfold/progress/FixedTimingTransitionProgressProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/progress/FixedTimingTransitionProgressProvider.kt similarity index 87% rename from packages/SystemUI/shared/src/com/android/unfold/progress/FixedTimingTransitionProgressProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/progress/FixedTimingTransitionProgressProvider.kt index acfe073211d7d..732882e990388 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/progress/FixedTimingTransitionProgressProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/progress/FixedTimingTransitionProgressProvider.kt @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.unfold.progress +package com.android.systemui.unfold.progress import android.animation.Animator import android.animation.ObjectAnimator import android.util.FloatProperty -import com.android.unfold.UnfoldTransitionProgressProvider -import com.android.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener -import com.android.unfold.updates.FOLD_UPDATE_FINISH_CLOSED -import com.android.unfold.updates.FOLD_UPDATE_UNFOLDED_SCREEN_AVAILABLE -import com.android.unfold.updates.FoldStateProvider -import com.android.unfold.updates.FoldStateProvider.FoldUpdate +import com.android.systemui.unfold.UnfoldTransitionProgressProvider +import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_CLOSED +import com.android.systemui.unfold.updates.FOLD_UPDATE_UNFOLDED_SCREEN_AVAILABLE +import com.android.systemui.unfold.updates.FoldStateProvider +import com.android.systemui.unfold.updates.FoldStateProvider.FoldUpdate /** * Emits animation progress with fixed timing after unfolding diff --git a/packages/SystemUI/shared/src/com/android/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt similarity index 89% rename from packages/SystemUI/shared/src/com/android/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt index d9d037fd99c11..b111892ceb6e6 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/progress/PhysicsBasedUnfoldTransitionProgressProvider.kt @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.unfold.progress +package com.android.systemui.unfold.progress import android.os.Handler import androidx.dynamicanimation.animation.DynamicAnimation import androidx.dynamicanimation.animation.FloatPropertyCompat import androidx.dynamicanimation.animation.SpringAnimation import androidx.dynamicanimation.animation.SpringForce -import com.android.unfold.UnfoldTransitionProgressProvider -import com.android.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener -import com.android.unfold.updates.FOLD_UPDATE_FINISH_CLOSED -import com.android.unfold.updates.FOLD_UPDATE_FINISH_FULL_OPEN -import com.android.unfold.updates.FOLD_UPDATE_UNFOLDED_SCREEN_AVAILABLE -import com.android.unfold.updates.FoldStateProvider -import com.android.unfold.updates.FoldStateProvider.FoldUpdate -import com.android.unfold.updates.FoldStateProvider.FoldUpdatesListener +import com.android.systemui.unfold.UnfoldTransitionProgressProvider +import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_CLOSED +import com.android.systemui.unfold.updates.FOLD_UPDATE_FINISH_FULL_OPEN +import com.android.systemui.unfold.updates.FOLD_UPDATE_UNFOLDED_SCREEN_AVAILABLE +import com.android.systemui.unfold.updates.FoldStateProvider +import com.android.systemui.unfold.updates.FoldStateProvider.FoldUpdate +import com.android.systemui.unfold.updates.FoldStateProvider.FoldUpdatesListener /** * Maps fold updates to unfold transition progress using DynamicAnimation. diff --git a/packages/SystemUI/shared/src/com/android/unfold/updates/DeviceFoldStateProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt similarity index 90% rename from packages/SystemUI/shared/src/com/android/unfold/updates/DeviceFoldStateProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt index 3a21b809ec300..949652bc91371 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/updates/DeviceFoldStateProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/DeviceFoldStateProvider.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.unfold.updates +package com.android.systemui.unfold.updates import android.content.Context import android.hardware.devicestate.DeviceStateManager import androidx.core.util.Consumer -import com.android.unfold.updates.screen.ScreenStatusProvider -import com.android.unfold.updates.FoldStateProvider.FoldUpdate -import com.android.unfold.updates.FoldStateProvider.FoldUpdatesListener -import com.android.unfold.updates.hinge.FULLY_OPEN_DEGREES -import com.android.unfold.updates.hinge.HingeAngleProvider +import com.android.systemui.unfold.updates.screen.ScreenStatusProvider +import com.android.systemui.unfold.updates.FoldStateProvider.FoldUpdate +import com.android.systemui.unfold.updates.FoldStateProvider.FoldUpdatesListener +import com.android.systemui.unfold.updates.hinge.FULLY_OPEN_DEGREES +import com.android.systemui.unfold.updates.hinge.HingeAngleProvider import java.util.concurrent.Executor internal class DeviceFoldStateProvider( diff --git a/packages/SystemUI/shared/src/com/android/unfold/updates/FoldStateProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/FoldStateProvider.kt similarity index 93% rename from packages/SystemUI/shared/src/com/android/unfold/updates/FoldStateProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/updates/FoldStateProvider.kt index 2c3a6ec2a0ed3..4c6d241b14560 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/updates/FoldStateProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/FoldStateProvider.kt @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.unfold.updates +package com.android.systemui.unfold.updates import android.annotation.FloatRange import android.annotation.IntDef -import com.android.unfold.updates.FoldStateProvider.FoldUpdatesListener +import com.android.systemui.unfold.updates.FoldStateProvider.FoldUpdatesListener import com.android.systemui.statusbar.policy.CallbackController /** diff --git a/packages/SystemUI/shared/src/com/android/unfold/updates/hinge/EmptyHingeAngleProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/EmptyHingeAngleProvider.kt similarity index 85% rename from packages/SystemUI/shared/src/com/android/unfold/updates/hinge/EmptyHingeAngleProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/EmptyHingeAngleProvider.kt index 905b08625beed..9b58b1fcad467 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/updates/hinge/EmptyHingeAngleProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/EmptyHingeAngleProvider.kt @@ -1,4 +1,4 @@ -package com.android.unfold.updates.hinge +package com.android.systemui.unfold.updates.hinge import androidx.core.util.Consumer diff --git a/packages/SystemUI/shared/src/com/android/unfold/updates/hinge/HingeAngleProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/HingeAngleProvider.kt similarity index 85% rename from packages/SystemUI/shared/src/com/android/unfold/updates/hinge/HingeAngleProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/HingeAngleProvider.kt index 4196f60e2ca8a..854991383a8c9 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/updates/hinge/HingeAngleProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/HingeAngleProvider.kt @@ -1,4 +1,4 @@ -package com.android.unfold.updates.hinge +package com.android.systemui.unfold.updates.hinge import androidx.core.util.Consumer import com.android.systemui.statusbar.policy.CallbackController diff --git a/packages/SystemUI/shared/src/com/android/unfold/updates/hinge/RotationSensorHingeAngleProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/RotationSensorHingeAngleProvider.kt similarity index 97% rename from packages/SystemUI/shared/src/com/android/unfold/updates/hinge/RotationSensorHingeAngleProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/RotationSensorHingeAngleProvider.kt index 011582efc67c3..8b6eecfdfde45 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/updates/hinge/RotationSensorHingeAngleProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/hinge/RotationSensorHingeAngleProvider.kt @@ -1,4 +1,4 @@ -package com.android.unfold.updates.hinge +package com.android.systemui.unfold.updates.hinge import android.hardware.Sensor import android.hardware.SensorEvent diff --git a/packages/SystemUI/shared/src/com/android/unfold/updates/screen/ScreenStatusProvider.kt b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt similarity index 87% rename from packages/SystemUI/shared/src/com/android/unfold/updates/screen/ScreenStatusProvider.kt rename to packages/SystemUI/shared/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt index a65e888b3e2e9..1eec8033ac5da 100644 --- a/packages/SystemUI/shared/src/com/android/unfold/updates/screen/ScreenStatusProvider.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/unfold/updates/screen/ScreenStatusProvider.kt @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.unfold.updates.screen +package com.android.systemui.unfold.updates.screen -import com.android.unfold.updates.screen.ScreenStatusProvider.ScreenListener +import com.android.systemui.unfold.updates.screen.ScreenStatusProvider.ScreenListener import com.android.systemui.statusbar.policy.CallbackController interface ScreenStatusProvider : CallbackController { diff --git a/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java b/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java index 54a1b5505df8d..c093219de59b0 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java @@ -92,9 +92,9 @@ import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.theme.ThemeOverlayApplier; import com.android.systemui.util.leak.LeakDetector; import com.android.systemui.util.settings.SecureSettings; -import com.android.unfold.UnfoldTransitionFactory; -import com.android.unfold.UnfoldTransitionProgressProvider; -import com.android.unfold.config.UnfoldTransitionConfig; +import com.android.systemui.unfold.UnfoldTransitionFactory; +import com.android.systemui.unfold.UnfoldTransitionProgressProvider; +import com.android.systemui.unfold.config.UnfoldTransitionConfig; import com.android.wm.shell.legacysplitscreen.LegacySplitScreen; import com.android.wm.shell.pip.Pip; diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/LifecycleScreenStatusProvider.kt b/packages/SystemUI/src/com/android/systemui/keyguard/LifecycleScreenStatusProvider.kt index d8905a076e016..f25ec5591e3ad 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/LifecycleScreenStatusProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/LifecycleScreenStatusProvider.kt @@ -16,8 +16,8 @@ package com.android.systemui.keyguard import com.android.systemui.dagger.SysUISingleton -import com.android.unfold.updates.screen.ScreenStatusProvider -import com.android.unfold.updates.screen.ScreenStatusProvider.ScreenListener +import com.android.systemui.unfold.updates.screen.ScreenStatusProvider +import com.android.systemui.unfold.updates.screen.ScreenStatusProvider.ScreenListener import javax.inject.Inject @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index d56bfbf330c6a..35c5e3bb8dc9d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -231,7 +231,7 @@ import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.concurrency.MessageRouter; import com.android.systemui.volume.VolumeComponent; import com.android.systemui.wmshell.BubblesManager; -import com.android.unfold.config.UnfoldTransitionConfig; +import com.android.systemui.unfold.config.UnfoldTransitionConfig; import com.android.wm.shell.bubbles.Bubbles; import com.android.wm.shell.legacysplitscreen.LegacySplitScreen; import com.android.wm.shell.startingsurface.SplashscreenContentDrawer; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java index 783bc259c018a..b36c45e7f8ef9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java @@ -108,7 +108,7 @@ import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.concurrency.MessageRouter; import com.android.systemui.volume.VolumeComponent; import com.android.systemui.wmshell.BubblesManager; -import com.android.unfold.config.UnfoldTransitionConfig; +import com.android.systemui.unfold.config.UnfoldTransitionConfig; import com.android.wm.shell.bubbles.Bubbles; import com.android.wm.shell.legacysplitscreen.LegacySplitScreen; import com.android.wm.shell.startingsurface.StartingSurface; diff --git a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt index 8e7c49a4780c5..7c61acecaebd7 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt @@ -23,8 +23,7 @@ import android.view.Surface import android.view.WindowManager import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main -import com.android.unfold.UnfoldTransitionProgressProvider -import com.android.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener +import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener import com.android.systemui.statusbar.LightRevealScrim import com.android.systemui.statusbar.LinearLightRevealEffect import java.util.concurrent.Executor diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index d2ffed67c60d6..6c59c3e27f238 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -145,7 +145,7 @@ import com.android.systemui.util.concurrency.MessageRouterImpl; import com.android.systemui.util.time.FakeSystemClock; import com.android.systemui.volume.VolumeComponent; import com.android.systemui.wmshell.BubblesManager; -import com.android.unfold.config.UnfoldTransitionConfig; +import com.android.systemui.unfold.config.UnfoldTransitionConfig; import com.android.wm.shell.bubbles.Bubbles; import com.android.wm.shell.legacysplitscreen.LegacySplitScreen; import com.android.wm.shell.startingsurface.StartingSurface;