Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c0dc04 authored Apr 01, 2022 by Vadim Caen Committed by Automerger Merge Worker Apr 01, 2022

Merge "Split animation methods out of OnBackInvokedCallback" into tm-dev am:...

Merge "Split animation methods out of OnBackInvokedCallback" into tm-dev am: d0923a21 am: ce4cdf79

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

Change-Id: I13b53084f418b286b60ceffb3ab35a83bd44fa0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5229d159 ce4cdf79

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -57987,7 +57987,7 @@ package android.widget.inline {
		package android.window {

		public interface OnBackInvokedCallback {
		method public default void onBackInvoked();
		method public void onBackInvoked();
		}

		public interface OnBackInvokedDispatcher {

core/java/android/app/Activity.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -1663,12 +1663,7 @@ public class Activity extends ContextThemeWrapper
		.isOnBackInvokedCallbackEnabled(this);
		if (aheadOfTimeBack) {
		// Add onBackPressed as default back behavior.
		mDefaultBackCallback = new OnBackInvokedCallback() {
		@Override
		public void onBackInvoked() {
		navigateBack();
		}
		};
		mDefaultBackCallback = this::navigateBack;
		getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);
		}
		}

core/java/android/app/Dialog.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -459,12 +459,7 @@ public class Dialog implements DialogInterface, Window.Callback,
		if (mContext != null
		&& WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
		// Add onBackPressed as default back behavior.
		mDefaultBackCallback = new OnBackInvokedCallback() {
		@Override
		public void onBackInvoked() {
		onBackPressed();
		}
		};
		mDefaultBackCallback = this::onBackPressed;
		getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
		OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback);
		mDefaultBackCallback = null;

core/java/android/view/ViewRootImpl.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -10774,12 +10774,9 @@ public final class ViewRootImpl implements ViewParent,
		}

		private void registerCompatOnBackInvokedCallback() {
		mCompatOnBackInvokedCallback = new OnBackInvokedCallback() {
		@Override
		public void onBackInvoked() {
		mCompatOnBackInvokedCallback = () -> {
		sendBackKeyEvent(KeyEvent.ACTION_DOWN);
		sendBackKeyEvent(KeyEvent.ACTION_UP);
		}
		};
		mOnBackInvokedDispatcher.registerOnBackInvokedCallback(
		OnBackInvokedDispatcher.PRIORITY_DEFAULT, mCompatOnBackInvokedCallback);

core/java/android/widget/Editor.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -240,12 +240,7 @@ public class Editor {

		private final boolean mHapticTextHandleEnabled;
		/** Handles OnBackInvokedCallback back dispatch */
		private final OnBackInvokedCallback mBackCallback = new OnBackInvokedCallback() {
		@Override
		public void onBackInvoked() {
		stopTextActionMode();
		}
		};
		private final OnBackInvokedCallback mBackCallback = this::stopTextActionMode;
		private boolean mBackCallbackRegistered;

		@Nullable