Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2a68c625dc5bcf8ca9d798dd1b68119ba9aebe61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-10 11:01:50 +00:00
committed by Automerger Merge Worker
parent 3919334288 e58e8db8fe
commit 9bdbb8c334
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -1489,6 +1489,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
.setDuration(mDialogHideAnimationDurationMs) .setDuration(mDialogHideAnimationDurationMs)
.setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator()) .setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator())
.withEndAction(() -> mHandler.postDelayed(() -> { .withEndAction(() -> mHandler.postDelayed(() -> {
mController.notifyVisible(false);
mDialog.dismiss(); mDialog.dismiss();
tryToRemoveCaptionsTooltip(); tryToRemoveCaptionsTooltip();
mIsAnimatingDismiss = false; mIsAnimatingDismiss = false;
@@ -1499,7 +1500,6 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
animator.setListener(getJankListener(getDialogView(), TYPE_DISMISS, animator.setListener(getJankListener(getDialogView(), TYPE_DISMISS,
mDialogHideAnimationDurationMs)).start(); mDialogHideAnimationDurationMs)).start();
checkODICaptionsTooltip(true); checkODICaptionsTooltip(true);
mController.notifyVisible(false);
synchronized (mSafetyWarningLock) { synchronized (mSafetyWarningLock) {
if (mSafetyWarning != null) { if (mSafetyWarning != null) {
if (D.BUG) Log.d(TAG, "SafetyWarning dismissed"); if (D.BUG) Log.d(TAG, "SafetyWarning dismissed");

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

@@ -16,6 +16,7 @@
package com.android.systemui.volume; 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 com.android.systemui.volume.VolumeDialogControllerImpl.STREAMS;
import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertEquals;
@@ -342,6 +343,15 @@ public class VolumeDialogImplTest extends SysuiTestCase {
assertEquals(mDialog.mVolumeRingerMuteIconDrawableId, R.drawable.ic_volume_ringer_mute); 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 @Test
public void testContentDescriptions() { public void testContentDescriptions() {