commit b35b0862cbf9417ef4b006a0646c4fa3f870eae8
author Brandon Dayauon <brdayauon@google.com> Thu Jun 05 15:05:17 2025 -0700
committer Brandon Dayauon <brdayauon@google.com> Fri Jun 06 15:00:52 2025 -0700
tree c3aa07a81241d8f84e578e5b0fac49986c9486e6
parent f8995892518195cde3e5270301e0aec1e4bd63bd

Update updateView() call for private space animation

bug: 421983509
Test: manually presubmit
Flag: EXEMPT bug fix
Change-Id: I2b7c3eb918644225a4b58c32cb76e37f441e6a37

src/com/android/launcher3/allapps/PrivateProfileManager.java

diff --git a/src/com/android/launcher3/allapps/PrivateProfileManager.java b/src/com/android/launcher3/allapps/PrivateProfileManager.java
index c7c2bfe..1649f4d 100644
--- a/src/com/android/launcher3/allapps/PrivateProfileManager.java
+++ b/src/com/android/launcher3/allapps/PrivateProfileManager.java
@@ -377,6 +377,8 @@
         assert lockPill != null;
         mLockText = lockPill.findViewById(R.id.lock_text);
         assert mLockText != null;
+        ViewGroup.MarginLayoutParams lockTextLayoutParams =
+                (ViewGroup.MarginLayoutParams) mLockText.getLayoutParams();
         mPrivateSpaceSettingsButton = mPSHeader.findViewById(R.id.ps_settings_button);
         assert mPrivateSpaceSettingsButton != null;
         //Add image for private space transitioning view
@@ -394,9 +396,15 @@
                     mLockText.setVisibility(VISIBLE);
                     mLockText.setAlpha(1);
                     mLockText.setHorizontallyScrolling(false);
+                    mLockText.measure(0,0);
+                    lockTextLayoutParams.width = mLockText.getMeasuredWidth();
+                    lockTextLayoutParams.setMarginStart(mLockTextMarginStart);
+                    lockTextLayoutParams.setMarginEnd(mLockTextMarginEnd);
+
                     mPrivateSpaceSettingsButton.setVisibility(
                             isPrivateSpaceSettingsAvailable() ? VISIBLE : GONE);
                     mPrivateSpaceSettingsButton.setClickable(isPrivateSpaceSettingsAvailable());
+                    mPrivateSpaceSettingsButton.setAlpha(1f);
                 }
                 lockPill.setVisibility(VISIBLE);
                 lockPill.setOnClickListener(view -> lockingAction(/* lock */ true));
@@ -414,12 +422,16 @@
                 mLockText.setVisibility(GONE);
                 mLockText.setAlpha(0);
                 mLockText.setHorizontallyScrolling(false);
+                lockTextLayoutParams.width = 0;
+                lockTextLayoutParams.setMarginStart(0);
+                lockTextLayoutParams.setMarginEnd(0);
                 lockPill.setVisibility(VISIBLE);
                 lockPill.setOnClickListener(view -> lockingAction(/* lock */ false));
                 lockPill.setContentDescription(mLockedStateContentDesc);
 
                 mPrivateSpaceSettingsButton.setVisibility(GONE);
                 mPrivateSpaceSettingsButton.setClickable(false);
+                mPrivateSpaceSettingsButton.setAlpha(0f);
                 transitionView.setVisibility(GONE);
             }
             case STATE_TRANSITION -> {
@@ -427,6 +439,7 @@
                 lockPill.setVisibility(GONE);
             }
         }
+        mLockText.setLayoutParams(lockTextLayoutParams);
         mPSHeader.invalidate();
         Trace.endSection();
     }