| commit | 3ed2933399835305a297ce24c2678aa6a6f4a754 | [log] [tgz] |
|---|---|---|
| author | Nick Chameyev <nickchameyev@google.com> | Thu Aug 19 11:09:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 19 11:09:18 2021 +0000 |
| tree | 3f94382a432d62833bc00cd32008d167143a6874 | |
| parent | 8afdad42306427d30e6fe0d1e6e31e4c70abdff3 [diff] | |
| parent | 88cd9aaa6bece70f7d7aebab192558e7123627ad [diff] |
Merge "Update unfold transition package name" into sc-v2-dev am: 88cd9aaa6b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15612007 Change-Id: Ie5c9f712b8b440eb5e39ca5113c435a9cfd53aab
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;