Loading core/api/current.txt +1 −1 Original line number Original line Diff line number Diff line Loading @@ -57981,7 +57981,7 @@ package android.widget.inline { package android.window { package android.window { public interface OnBackInvokedCallback { public interface OnBackInvokedCallback { method public default void onBackInvoked(); method public void onBackInvoked(); } } public interface OnBackInvokedDispatcher { public interface OnBackInvokedDispatcher { core/java/android/app/Activity.java +1 −6 Original line number Original line Diff line number Diff line Loading @@ -1663,12 +1663,7 @@ public class Activity extends ContextThemeWrapper .isOnBackInvokedCallbackEnabled(this); .isOnBackInvokedCallbackEnabled(this); if (aheadOfTimeBack) { if (aheadOfTimeBack) { // Add onBackPressed as default back behavior. // Add onBackPressed as default back behavior. mDefaultBackCallback = new OnBackInvokedCallback() { mDefaultBackCallback = this::navigateBack; @Override public void onBackInvoked() { navigateBack(); } }; getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback); getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback); } } } } Loading core/java/android/app/Dialog.java +1 −6 Original line number Original line Diff line number Diff line Loading @@ -459,12 +459,7 @@ public class Dialog implements DialogInterface, Window.Callback, if (mContext != null if (mContext != null && WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { && WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { // Add onBackPressed as default back behavior. // Add onBackPressed as default back behavior. mDefaultBackCallback = new OnBackInvokedCallback() { mDefaultBackCallback = this::onBackPressed; @Override public void onBackInvoked() { onBackPressed(); } }; getOnBackInvokedDispatcher().registerOnBackInvokedCallback( getOnBackInvokedDispatcher().registerOnBackInvokedCallback( OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback); OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback); mDefaultBackCallback = null; mDefaultBackCallback = null; Loading core/java/android/view/ViewRootImpl.java +1 −4 Original line number Original line Diff line number Diff line Loading @@ -10772,12 +10772,9 @@ public final class ViewRootImpl implements ViewParent, } } private void registerCompatOnBackInvokedCallback() { private void registerCompatOnBackInvokedCallback() { mCompatOnBackInvokedCallback = new OnBackInvokedCallback() { mCompatOnBackInvokedCallback = () -> { @Override public void onBackInvoked() { sendBackKeyEvent(KeyEvent.ACTION_DOWN); sendBackKeyEvent(KeyEvent.ACTION_DOWN); sendBackKeyEvent(KeyEvent.ACTION_UP); sendBackKeyEvent(KeyEvent.ACTION_UP); } }; }; mOnBackInvokedDispatcher.registerOnBackInvokedCallback( mOnBackInvokedDispatcher.registerOnBackInvokedCallback( OnBackInvokedDispatcher.PRIORITY_DEFAULT, mCompatOnBackInvokedCallback); OnBackInvokedDispatcher.PRIORITY_DEFAULT, mCompatOnBackInvokedCallback); Loading core/java/android/widget/Editor.java +1 −6 Original line number Original line Diff line number Diff line Loading @@ -240,12 +240,7 @@ public class Editor { private final boolean mHapticTextHandleEnabled; private final boolean mHapticTextHandleEnabled; /** Handles OnBackInvokedCallback back dispatch */ /** Handles OnBackInvokedCallback back dispatch */ private final OnBackInvokedCallback mBackCallback = new OnBackInvokedCallback() { private final OnBackInvokedCallback mBackCallback = this::stopTextActionMode; @Override public void onBackInvoked() { stopTextActionMode(); } }; private boolean mBackCallbackRegistered; private boolean mBackCallbackRegistered; @Nullable @Nullable Loading Loading
core/api/current.txt +1 −1 Original line number Original line Diff line number Diff line Loading @@ -57981,7 +57981,7 @@ package android.widget.inline { package android.window { package android.window { public interface OnBackInvokedCallback { public interface OnBackInvokedCallback { method public default void onBackInvoked(); method public void onBackInvoked(); } } public interface OnBackInvokedDispatcher { public interface OnBackInvokedDispatcher {
core/java/android/app/Activity.java +1 −6 Original line number Original line Diff line number Diff line Loading @@ -1663,12 +1663,7 @@ public class Activity extends ContextThemeWrapper .isOnBackInvokedCallbackEnabled(this); .isOnBackInvokedCallbackEnabled(this); if (aheadOfTimeBack) { if (aheadOfTimeBack) { // Add onBackPressed as default back behavior. // Add onBackPressed as default back behavior. mDefaultBackCallback = new OnBackInvokedCallback() { mDefaultBackCallback = this::navigateBack; @Override public void onBackInvoked() { navigateBack(); } }; getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback); getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback); } } } } Loading
core/java/android/app/Dialog.java +1 −6 Original line number Original line Diff line number Diff line Loading @@ -459,12 +459,7 @@ public class Dialog implements DialogInterface, Window.Callback, if (mContext != null if (mContext != null && WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { && WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) { // Add onBackPressed as default back behavior. // Add onBackPressed as default back behavior. mDefaultBackCallback = new OnBackInvokedCallback() { mDefaultBackCallback = this::onBackPressed; @Override public void onBackInvoked() { onBackPressed(); } }; getOnBackInvokedDispatcher().registerOnBackInvokedCallback( getOnBackInvokedDispatcher().registerOnBackInvokedCallback( OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback); OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback); mDefaultBackCallback = null; mDefaultBackCallback = null; Loading
core/java/android/view/ViewRootImpl.java +1 −4 Original line number Original line Diff line number Diff line Loading @@ -10772,12 +10772,9 @@ public final class ViewRootImpl implements ViewParent, } } private void registerCompatOnBackInvokedCallback() { private void registerCompatOnBackInvokedCallback() { mCompatOnBackInvokedCallback = new OnBackInvokedCallback() { mCompatOnBackInvokedCallback = () -> { @Override public void onBackInvoked() { sendBackKeyEvent(KeyEvent.ACTION_DOWN); sendBackKeyEvent(KeyEvent.ACTION_DOWN); sendBackKeyEvent(KeyEvent.ACTION_UP); sendBackKeyEvent(KeyEvent.ACTION_UP); } }; }; mOnBackInvokedDispatcher.registerOnBackInvokedCallback( mOnBackInvokedDispatcher.registerOnBackInvokedCallback( OnBackInvokedDispatcher.PRIORITY_DEFAULT, mCompatOnBackInvokedCallback); OnBackInvokedDispatcher.PRIORITY_DEFAULT, mCompatOnBackInvokedCallback); Loading
core/java/android/widget/Editor.java +1 −6 Original line number Original line Diff line number Diff line Loading @@ -240,12 +240,7 @@ public class Editor { private final boolean mHapticTextHandleEnabled; private final boolean mHapticTextHandleEnabled; /** Handles OnBackInvokedCallback back dispatch */ /** Handles OnBackInvokedCallback back dispatch */ private final OnBackInvokedCallback mBackCallback = new OnBackInvokedCallback() { private final OnBackInvokedCallback mBackCallback = this::stopTextActionMode; @Override public void onBackInvoked() { stopTextActionMode(); } }; private boolean mBackCallbackRegistered; private boolean mBackCallbackRegistered; @Nullable @Nullable Loading