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

Commit 79ed761e authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Null-check AV before checking its alpha." into rvc-dev am: 1b824ba3... 

Merge "Null-check AV before checking its alpha." into rvc-dev am: 1b824ba3 am: 1e4f4aec am: 047d1e5c

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

Change-Id: I12471df3bc9aafb42e755465d8fff56f72ac198d
parents 65b36be2 047d1e5c

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+2 −5
Original line number Diff line number Diff line
@@ -495,12 +495,9 @@ public class BubbleExpandedView extends LinearLayout { 
        }

        final float alpha = visibility ? 1f : 0f;



        if (alpha == mActivityView.getAlpha()) {

            return;

        }



        mPointerView.setAlpha(alpha);

        if (mActivityView != null) {



        if (mActivityView != null && alpha != mActivityView.getAlpha()) {

            mActivityView.setAlpha(alpha);

            mActivityView.bringToFront();

        }