commit 2fd98270a79d06a1077df10aecdec9088ca52624
author mpodolian <mpodolian@google.com> Wed Dec 04 16:23:00 2024 -0800
committer mpodolian <mpodolian@google.com> Wed Dec 04 16:23:00 2024 -0800
tree 62fecb822e41a39c347a38d4857db17c5dc17081
parent fb2525a850343d0158dcc32b0d191602bb92f417

Update Hotseat icons adjustment X calculation based on cell X Index

Resolved an issue where the X translation for hotseat icons was computed
using the view index in the parent, leading to misaligned adjustments.
The logic has been updated to calculate translation based on the cell X
index, ensuring more accurate positioning and alignment.

Fixes: 380794616
Test: Manual. Have a bubble in landscape orientation. Drag any item from
the hotseat to the workspace, then rotate the device.
Flag: com.android.wm.shell.enable_bubble_bar

Change-Id: Ibd0709e6c58ad9c1470de469cfced8bbe66fd30b

src/com/android/launcher3/Hotseat.java

diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index b2ccba4..8bda30d 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -36,6 +36,7 @@
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 
+import com.android.launcher3.celllayout.CellLayoutLayoutParams;
 import com.android.launcher3.util.HorizontalInsettableView;
 import com.android.launcher3.util.MultiPropertyFactory;
 import com.android.launcher3.util.MultiPropertyFactory.MultiProperty;
@@ -200,13 +201,16 @@
         AnimatorSet animatorSet = new AnimatorSet();
         for (int i = 0; i < icons.getChildCount(); i++) {
             View child = icons.getChildAt(i);
-            float tx = shouldAdjustHotseat ? dp.getHotseatAdjustedTranslation(getContext(), i) : 0;
-            if (child instanceof Reorderable) {
-                MultiTranslateDelegate mtd = ((Reorderable) child).getTranslateDelegate();
-                animatorSet.play(
-                        mtd.getTranslationX(INDEX_BUBBLE_ADJUSTMENT_ANIM).animateToValue(tx));
-            } else {
-                animatorSet.play(ObjectAnimator.ofFloat(child, VIEW_TRANSLATE_X, tx));
+            if (child.getLayoutParams() instanceof CellLayoutLayoutParams lp) {
+                float tx = shouldAdjustHotseat
+                        ? dp.getHotseatAdjustedTranslation(getContext(), lp.getCellX()) : 0;
+                if (child instanceof Reorderable) {
+                    MultiTranslateDelegate mtd = ((Reorderable) child).getTranslateDelegate();
+                    animatorSet.play(
+                            mtd.getTranslationX(INDEX_BUBBLE_ADJUSTMENT_ANIM).animateToValue(tx));
+                } else {
+                    animatorSet.play(ObjectAnimator.ofFloat(child, VIEW_TRANSLATE_X, tx));
+                }
             }
         }
         if (mQsb instanceof HorizontalInsettableView horizontalInsettableQsb) {