Merge "Fix Dialog default callback registering at the wrong priority." into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
0143f62f7a
@@ -458,8 +458,7 @@ public class Dialog implements DialogInterface, Window.Callback,
|
|||||||
&& WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
|
&& WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
|
||||||
// Add onBackPressed as default back behavior.
|
// Add onBackPressed as default back behavior.
|
||||||
mDefaultBackCallback = this::onBackPressed;
|
mDefaultBackCallback = this::onBackPressed;
|
||||||
getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
|
getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);
|
||||||
OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback);
|
|
||||||
mDefaultBackCallback = null;
|
mDefaultBackCallback = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user