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

Dismiss lingering volume dialog

Browse Source 
(1) Fault tolerance for the state where the dialog is not showing but
mShowing flag is set to false.

(2) Extra logging for better understanding the state of the dialog.

Bug: b/232606092

Test: Manual. Open volume dialog, adjust using volume buttons. Slider
should move smoothly and eventually dialog should dismiss smoothly.

Change-Id: Ie914f97925d8defb8c57818e5e7ffe958936336c
(cherry picked from commit 06a390a1de)
This commit is contained in:
Behnam Heydarshahi
2023-05-22 14:36:27 +00:00
parent 3d10caad63
commit 891f1dcf55
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,6 +414,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
@Override
public void destroy() {
Log.d(TAG, "destroy() called");
mController.removeCallback(mControllerCallbackH);
mHandler.removeCallbacksAndMessages(null);
mConfigurationController.removeCallback(this);
@@ -488,6 +489,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
}
private void initDialog(int lockTaskModeState) {
Log.d(TAG, "initDialog: called!");
mDialog = new CustomDialog(mContext);
initDimens();
@@ -1281,7 +1283,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
}
protected void tryToRemoveCaptionsTooltip() {
if (mHasSeenODICaptionsTooltip && mODICaptionsTooltipView != null) {
if (mHasSeenODICaptionsTooltip && mODICaptionsTooltipView != null && mDialog != null) {
ViewGroup container = mDialog.findViewById(R.id.volume_dialog_container);
container.removeView(mODICaptionsTooltipView);
mODICaptionsTooltipView = null;
@@ -1471,8 +1473,16 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
mHandler.removeMessages(H.DISMISS);
mHandler.removeMessages(H.SHOW);
if (mIsAnimatingDismiss) {
Log.d(TAG, "dismissH: isAnimatingDismiss");
boolean showingStateInconsistent = !mShowing && mDialog != null && mDialog.isShowing();
// If incorrectly assuming dialog is not showing, continue and make the state consistent.
if (showingStateInconsistent) {
Log.d(TAG, "dismissH: volume dialog possible in inconsistent state:"
+ "mShowing=" + mShowing + ", mDialog==null?" + (mDialog == null));
}
if (mIsAnimatingDismiss && !showingStateInconsistent) {
Log.d(TAG, "dismissH: skipping dismiss because isAnimatingDismiss is true"
+ " and showingStateInconsistent is false");
Trace.endSection();
return;
}
@@ -1490,8 +1500,12 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
.setDuration(mDialogHideAnimationDurationMs)
.setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator())
.withEndAction(() -> mHandler.postDelayed(() -> {
mController.notifyVisible(false);
mDialog.dismiss();
if (mController != null) {
mController.notifyVisible(false);
}
if (mDialog != null) {
mDialog.dismiss();
}
tryToRemoveCaptionsTooltip();
mIsAnimatingDismiss = false;