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

Commit 9bdbb8c3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix volume dialog dismiss animation" into tm-qpr-dev am: e58e8db8 

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



Change-Id: I2a68c625dc5bcf8ca9d798dd1b68119ba9aebe61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39193342 e58e8db8

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

+1 −1
Original line number Diff line number Diff line
@@ -1489,6 +1489,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
                .setDuration(mDialogHideAnimationDurationMs)

                .setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator())

                .withEndAction(() -> mHandler.postDelayed(() -> {

                    mController.notifyVisible(false);

                    mDialog.dismiss();

                    tryToRemoveCaptionsTooltip();

                    mIsAnimatingDismiss = false;
@@ -1499,7 +1500,6 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
        animator.setListener(getJankListener(getDialogView(), TYPE_DISMISS,

                mDialogHideAnimationDurationMs)).start();

        checkODICaptionsTooltip(true);

        mController.notifyVisible(false);

        synchronized (mSafetyWarningLock) {

            if (mSafetyWarning != null) {

                if (D.BUG) Log.d(TAG, "SafetyWarning dismissed");

packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.volume;



import static com.android.systemui.volume.Events.DISMISS_REASON_UNKNOWN;

import static com.android.systemui.volume.VolumeDialogControllerImpl.STREAMS;



import static junit.framework.Assert.assertEquals;
@@ -342,6 +343,15 @@ public class VolumeDialogImplTest extends SysuiTestCase { 
        assertEquals(mDialog.mVolumeRingerMuteIconDrawableId, R.drawable.ic_volume_ringer_mute);

    }



    @Test

    public void testDialogDismissAnimation_notifyVisibleIsNotCalledBeforeAnimation() {

        mDialog.dismissH(DISMISS_REASON_UNKNOWN);

        // notifyVisible(false) should not be called immediately but only after the dismiss

        // animation has ended.

        verify(mVolumeDialogController, times(0)).notifyVisible(false);

        mDialog.getDialogView().animate().cancel();

    }



/*

    @Test

    public void testContentDescriptions() {