Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29b374bc authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Don't let settings button clickable during animation." into main

parents 1c909010 da952035

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

+10 −0
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ public class PrivateProfileManager extends UserProfileManager { 
                    mLockText.setHorizontallyScrolling(false);

                    mPrivateSpaceSettingsButton.setVisibility(

                            isPrivateSpaceSettingsAvailable() ? VISIBLE : GONE);

                    mPrivateSpaceSettingsButton.setClickable(isPrivateSpaceSettingsAvailable());

                }

                lockPill.setVisibility(VISIBLE);

                lockPill.setOnClickListener(view -> lockingAction(/* lock */ true));
@@ -425,6 +426,7 @@ public class PrivateProfileManager extends UserProfileManager { 
                lockPill.setContentDescription(mLockedStateContentDesc);



                mPrivateSpaceSettingsButton.setVisibility(GONE);

                mPrivateSpaceSettingsButton.setClickable(false);

                transitionView.setVisibility(GONE);

            }

            case STATE_TRANSITION -> {
@@ -794,6 +796,14 @@ public class PrivateProfileManager extends UserProfileManager { 
            @Override

            public void onAnimationStart(Animator animator) {

                mPrivateSpaceSettingsButton.setVisibility(VISIBLE);

                mPrivateSpaceSettingsButton.setClickable(false);

            }



            @Override

            public void onAnimationEnd(Animator animator) {

                if (expand) {

                    mPrivateSpaceSettingsButton.setClickable(true);

                }

            }

        });

        return settingsAlphaAnim;