| commit | 7791e400ff4bf5a2b1926b5e8618099f4bbb1d78 | [log] [tgz] |
|---|---|---|
| author | Nick Chameyev <nickchameyev@google.com> | Thu Aug 19 11:15:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 19 11:15:08 2021 +0000 |
| tree | 0b7cd69b35c2f59f153d6c3c37b6de43646d1c90 | |
| parent | 0d25ed8ac0dff87b9bb93fb119bf0a5103a2f669 [diff] | |
| parent | 3ed2933399835305a297ce24c2678aa6a6f4a754 [diff] |
Merge "Update unfold transition package name" into sc-v2-dev am: 88cd9aaa6b am: 3ed2933399 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15612007 Change-Id: I9ce14d7b70ebf61757aa145925ce339cdfdf98b5
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 069af96..14bc380 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -84,9 +84,9 @@ import com.android.quickstep.util.QuickstepOnboardingPrefs; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; -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 java.io.FileDescriptor; import java.io.PrintWriter;
diff --git a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java index d0fb9e5..c5ab84d 100644 --- a/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java +++ b/quickstep/src/com/android/quickstep/util/LauncherUnfoldAnimationController.java
@@ -24,8 +24,8 @@ import com.android.launcher3.Hotseat; import com.android.launcher3.Launcher; import com.android.launcher3.util.HorizontalInsettableView; -import com.android.unfold.UnfoldTransitionProgressProvider; -import com.android.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener; +import com.android.systemui.unfold.UnfoldTransitionProgressProvider; +import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener; /** * Controls animations that are happening during unfolding foldable devices
diff --git a/quickstep/src/com/android/quickstep/util/ProxyScreenStatusProvider.java b/quickstep/src/com/android/quickstep/util/ProxyScreenStatusProvider.java index 9eda8f4..3777c65 100644 --- a/quickstep/src/com/android/quickstep/util/ProxyScreenStatusProvider.java +++ b/quickstep/src/com/android/quickstep/util/ProxyScreenStatusProvider.java
@@ -17,7 +17,7 @@ import androidx.annotation.NonNull; -import com.android.unfold.updates.screen.ScreenStatusProvider; +import com.android.systemui.unfold.updates.screen.ScreenStatusProvider; import java.util.ArrayList; import java.util.List;
diff --git a/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterWorkspaceAnimator.java b/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterWorkspaceAnimator.java index 126e044..482092d 100644 --- a/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterWorkspaceAnimator.java +++ b/quickstep/src/com/android/quickstep/util/UnfoldMoveFromCenterWorkspaceAnimator.java
@@ -29,7 +29,7 @@ import com.android.launcher3.widget.NavigableAppWidgetHostView; import com.android.systemui.shared.animation.UnfoldMoveFromCenterAnimator; import com.android.systemui.shared.animation.UnfoldMoveFromCenterAnimator.TranslationApplier; -import com.android.unfold.UnfoldTransitionProgressProvider; +import com.android.systemui.unfold.UnfoldTransitionProgressProvider; import java.util.HashMap; import java.util.Map;