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

Commit 7d9f97ae authored by Alison Cichowlas's avatar Alison Cichowlas Committed by Automerger Merge Worker
Browse files

Merge "Change mODICaptionsTooltipView null check occasion to avoid potential... 

Merge "Change mODICaptionsTooltipView null check occasion to avoid potential crash" am: 1add3774 am: dc350b95 am: d0376c0a

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



Change-Id: I484816a71b3945abf01be9b76bf7da65e54281dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 732fee85 d0376c0a

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+8 −8
Original line number Diff line number Diff line
@@ -1244,13 +1244,13 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
            rescheduleTimeoutH();

        }



        if (mODICaptionsTooltipView != null) {

            mODICaptionsTooltipView.setAlpha(0.0f);



        // We need to wait for layout and then center the caption view. Since the height of the

        // dialog is now dynamic (with the variable ringer drawer height changing the height of

        // the dialog), we need to do this here in code vs. in XML.

        mHandler.post(() -> {

            if (mODICaptionsTooltipView != null) {

                mODICaptionsTooltipView.setAlpha(0.0f);



                final int[] odiTooltipLocation = mODICaptionsTooltipView.getLocationOnScreen();

                final int[] odiButtonLocation = mODICaptionsIcon.getLocationOnScreen();
@@ -1276,8 +1276,8 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
                            }

                        })

                        .start();

            });

            }

        });

    }



    private void hideCaptionsTooltip() {