Merge "Do not animate icon alignment in phone mode" into main

2023-11-02 16:23:39 +00:00
parent 2424d48867 d313ee0c35
commit 109b442a83
1 changed files with 5 additions and 5 deletions
@@ -581,6 +581,11 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
     *                       1 => fully aligned
     */
    public void setLauncherIconAlignment(float alignmentRatio, DeviceProfile launcherDp) {
+        if (isPhoneMode(launcherDp)) {
+            mIconAlignControllerLazy = null;
+            return;
+        }
+
        boolean isHotseatIconOnTopWhenAligned =
                mControllers.uiController.isHotseatIconOnTopWhenAligned();
        boolean isStashed = mControllers.taskbarStashController.isStashed();
@@ -609,11 +614,6 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
     */
    private AnimatorPlaybackController createIconAlignmentController(DeviceProfile launcherDp) {
        PendingAnimation setter = new PendingAnimation(100);
-        if (TaskbarManager.isPhoneMode(launcherDp)) {
-            // No animation for icons in small-screen
-            return setter.createPlaybackController();
-        }
-
        mOnControllerPreCreateCallback.run();
        DeviceProfile taskbarDp = mActivity.getDeviceProfile();
        Rect hotseatPadding = launcherDp.getHotseatLayoutPadding(mActivity);