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

Commit dbf5c125 authored by Ying Xu's avatar Ying Xu Committed by Automerger Merge Worker
Browse files

Merge "Immediately hide the icons when QS starts to expand" into sc-dev am: edec7fd6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14387673

Change-Id: Id91aae563c12df7c9d12afc8aec3e1ff9a21a080
parents d946cbef edec7fd6

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+17 −26
Original line number Diff line number Diff line
@@ -242,14 +242,6 @@ public class QuickStatusBarHeader extends FrameLayout { 
                .addFloat(mDateView, "alpha", 0, 1)

                .addFloat(mSecurityHeaderView, "alpha", 0, 1)

                .addFloat(mQSCarriers, "alpha", 0, 1);



        if (noCallingIcon != null || callStrengthIcon != null) {

            if (noCallingIcon != null) {

                builder.addFloat(noCallingIcon, "alpha", 1, 0);

            }

            if (callStrengthIcon != null) {

                builder.addFloat(callStrengthIcon, "alpha", 1, 0);

            }

        builder.setListener(new TouchAnimator.ListenerAdapter() {

            @Override

            public void onAnimationAtEnd() {
@@ -259,8 +251,8 @@ public class QuickStatusBarHeader extends FrameLayout { 


            @Override

            public void onAnimationStarted() {

                    mIconContainer.removeIgnoredSlot(mMobileSlotName);

                    mIconContainer.removeIgnoredSlot(mCallStrengthSlotName);

                mIconContainer.addIgnoredSlot(mMobileSlotName);

                mIconContainer.addIgnoredSlot(mCallStrengthSlotName);

            }



            @Override
@@ -270,7 +262,6 @@ public class QuickStatusBarHeader extends FrameLayout { 
                mIconContainer.removeIgnoredSlot(mCallStrengthSlotName);

            }

        });

        }

        mAlphaAnimator = builder.build();

    }