Merge "Don't let ringer drawer icons be clicked while the drawer is animating closed." into sc-dev am: 286530b685

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

Change-Id: If63972f8dcf8029cf8a93d879f76dd5dd8057ec7
This commit is contained in:
Josh Tsuji
2021-08-05 19:29:44 +00:00
committed by Automerger Merge Worker

View File

@@ -2248,6 +2248,11 @@ public class VolumeDialogImpl implements VolumeDialog,
@Override @Override
public void onClick(View view) { public void onClick(View view) {
// If the ringer drawer isn't open, don't let anything in it be clicked.
if (!mIsRingerDrawerOpen) {
return;
}
setRingerMode(mClickedRingerMode); setRingerMode(mClickedRingerMode);
mRingerDrawerIconAnimatingSelected = getDrawerIconViewForMode(mClickedRingerMode); mRingerDrawerIconAnimatingSelected = getDrawerIconViewForMode(mClickedRingerMode);