Merge "Fix volume dialog dismiss animation" into tm-qpr-dev (e58e8db8) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1487,6 +1487,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
		.setDuration(mDialogHideAnimationDurationMs)
		.setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator())
		.withEndAction(() -> mHandler.postDelayed(() -> {
		mController.notifyVisible(false);
		mDialog.dismiss();
		tryToRemoveCaptionsTooltip();
		mIsAnimatingDismiss = false;
		@@ -1497,7 +1498,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");

+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() {