Merge "Fix Pinning Animation" into main

1 files changed, 1 insertions, 1 deletions

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
index f15ef8c52c..ac9d2ba8bf 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
@@ -496,7 +496,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
 
         float finalScale;
         TaskbarSharedState sharedState = mControllers.getSharedState();
-        if (sharedState != null || mControllers.getSharedState().startTaskbarVariantIsTransient) {
+        if (sharedState != null && sharedState.startTaskbarVariantIsTransient) {
             finalScale = mapRange(scale, 1f, ((float) mPersistentIconSize / mTransientIconSize));
         } else {
             finalScale = mapRange(scale, ((float) mTransientIconSize / mPersistentIconSize), 1f);