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

Merge "Deprecate Activity#onBackPressed and Dialog#onBackPressed." into tm-dev

Browse Source
This commit is contained in:
Shan Huang
2022-03-31 00:17:02 +00:00
committed by Android (Google) Code Review
parent 2c06ff3da8 f66c4d611b
commit 1b284d865f
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -4157,7 +4157,7 @@ package android.app {
method protected void onActivityResult(int, int, android.content.Intent);
method @Deprecated public void onAttachFragment(android.app.Fragment);
method public void onAttachedToWindow();
method public void onBackPressed();
method @Deprecated public void onBackPressed();
method protected void onChildTitleChanged(android.app.Activity, CharSequence);
method public void onConfigurationChanged(@NonNull android.content.res.Configuration);
method public void onContentChanged();
@@ -5049,7 +5049,7 @@ package android.app {
method @CallSuper public void onActionModeFinished(android.view.ActionMode);
method @CallSuper public void onActionModeStarted(android.view.ActionMode);
method public void onAttachedToWindow();
method public void onBackPressed();
method @Deprecated public void onBackPressed();
method public void onContentChanged();
method public boolean onContextItemSelected(@NonNull android.view.MenuItem);
method public void onContextMenuClosed(@NonNull android.view.Menu);
@@ -32947,6 +32947,7 @@ package android.preference {
method @Deprecated public boolean isMultiPane();
method @Deprecated protected boolean isValidFragment(String);
method @Deprecated public void loadHeadersFromResource(@XmlRes int, java.util.List<android.preference.PreferenceActivity.Header>);
method @Deprecated public void onBackPressed();
method @Deprecated public void onBuildHeaders(java.util.List<android.preference.PreferenceActivity.Header>);
method @Deprecated public android.content.Intent onBuildStartFragmentIntent(String, android.os.Bundle, @StringRes int, int);
method @Deprecated public android.preference.PreferenceActivity.Header onGetInitialHeader();

4
core/java/android/app/Activity.java
View File

@@ -3938,7 +3938,11 @@ public class Activity extends ContextThemeWrapper
* </ul>
*
* @see #moveTaskToBack(boolean)
*
* @deprecated Use {@link OnBackInvokedCallback} or
* {@code androidx.activity.OnBackPressedCallback} to handle back navigation instead.
*/
@Deprecated
public void onBackPressed() {
if (mActionBar != null && mActionBar.collapseActionView()) {
return;

4
core/java/android/app/Dialog.java
View File

@@ -726,7 +726,11 @@ public class Dialog implements DialogInterface, Window.Callback,
* Called when the dialog has detected the user's press of the back
* key. The default implementation simply cancels the dialog (only if
* it is cancelable), but you can override this to do whatever you want.
*
* @deprecated Use {@link OnBackInvokedCallback} or
* {@code androidx.activity.OnBackPressedCallback} to handle back navigation instead.
*/
@Deprecated
public void onBackPressed() {
if (mCancelable) {
cancel();