Merge "[DO NOT MERGE] Update onBackPressed() function signature" into tm-qpr-dev (4b3a0012) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3323,7 +3323,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		@Override
		public boolean onBackPressed() {
		if (mStatusBarKeyguardViewManager.canHandleBackPressed()) {
		mStatusBarKeyguardViewManager.onBackPressed(false /* unused */);
		mStatusBarKeyguardViewManager.onBackPressed();
		return true;
		}
		if (mNotificationPanelViewController.isQsCustomizing()) {

+4 −11

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		if (DEBUG) {
		Log.d(TAG, "onBackInvokedCallback() called, invoking onBackPressed()");
		}
		onBackPressed(false /* unused */);
		onBackPressed();
		};
		private boolean mIsBackCallbackRegistered = false;

		@@ -1088,16 +1088,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		/**
		* Notifies this manager that the back button has been pressed.
		*/
		// TODO(b/244635782): This "accept boolean and ignore it, and always return false" was done
		// to make it possible to check this in and allow merging to master,
		// where ArcStatusBarKeyguardViewManager inherits this class, and its
		// build will break if we change this interface.
		// So, overall, while this function refactors the behavior of onBackPressed,
		// (it now handles the back press, and no longer returns whether it did so)
		// its interface is not changing right now (but will, in a follow-up CL).
		public boolean onBackPressed(boolean ignored) {
		public void onBackPressed() {
		if (!canHandleBackPressed()) {
		return false;
		return;
		}

		mCentralSurfaces.endAffordanceLaunch();
		@@ -1118,7 +1111,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		mNotificationPanelViewController.expandWithoutQs();
		}
		}
		return false;
		return;
		}

		@Override