Merge "Remove flag delegate_back_gesture_to_shell" into main (db3e0319) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+0 −12

Original line number	Diff line number	Diff line
		@@ -412,18 +412,6 @@ flag {
		}
		}

		flag {
		name: "delegate_back_gesture_to_shell"
		namespace: "windowing_frontend"
		description: "Delegate back gesture event to back animation controller."
		bug: "394599430"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}


		flag {
		name: "enable_handlers_debugging_mode"
		namespace: "windowing_frontend"

+0 −3

Original line number	Diff line number	Diff line
		@@ -1164,9 +1164,6 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		}

		private void registerBackGestureDelegate() {
		if (!Flags.delegateBackGestureToShell()) {
		return;
		}
		mInputManager.registerKeyGestureEventHandler(List.of(KeyGestureEvent.KEY_GESTURE_TYPE_BACK),
		(event, focussedToken) -> {
		if (event.getKeyGestureType() == KeyGestureEvent.KEY_GESTURE_TYPE_BACK) {

+0 −10

Original line number	Diff line number	Diff line
		@@ -108,7 +108,6 @@ import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.L
		import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_OPEN;
		import static com.android.systemui.shared.Flags.enableLppAssistInvocationEffect;
		import static com.android.systemui.shared.Flags.enableLppAssistInvocationHapticEffect;
		import static com.android.window.flags.Flags.delegateBackGestureToShell;

		import android.accessibilityservice.AccessibilityService;
		import android.annotation.NonNull;
		@@ -3452,9 +3451,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		KeyGestureEvent.KEY_GESTURE_TYPE_GLOBAL_ACTIONS,
		KeyGestureEvent.KEY_GESTURE_TYPE_TV_TRIGGER_BUG_REPORT
		));
		if (!delegateBackGestureToShell()) {
		supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_BACK);
		}
		if (!com.android.window.flags.Flags.grantManageKeyGesturesToRecents()) {
		// When grantManageKeyGesturesToRecents is enabled, the event is handled in the
		// recents app.
		@@ -3545,12 +3541,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}
		break;
		case KeyGestureEvent.KEY_GESTURE_TYPE_BACK:
		if (!delegateBackGestureToShell() && complete) {
		injectBackGesture(SystemClock.uptimeMillis(),
		getTargetDisplayIdForKeyGestureEvent(event));
		}
		break;
		case KeyGestureEvent.KEY_GESTURE_TYPE_MULTI_WINDOW_NAVIGATION:
		if (complete) {
		StatusBarManagerInternal statusbar = getStatusBarManagerInternal();

+0 −10

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@ import android.content.Intent;
		import android.hardware.input.AppLaunchData;
		import android.hardware.input.KeyGestureEvent;
		import android.os.RemoteException;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.annotations.Presubmit;
		import android.provider.Settings;
		import android.util.SparseArray;
		@@ -275,19 +273,11 @@ public class KeyGestureEventTests extends ShortcutKeyTestBase {
		}

		@Test
		@EnableFlags(com.android.window.flags.Flags.FLAG_DELEGATE_BACK_GESTURE_TO_SHELL)
		public void testKeyGestureBack_notHandled() {
		sendKeyGestureEventComplete(KeyGestureEvent.KEY_GESTURE_TYPE_BACK);
		mPhoneWindowManager.assertBackEventNotInjected();
		}

		@Test
		@DisableFlags(com.android.window.flags.Flags.FLAG_DELEGATE_BACK_GESTURE_TO_SHELL)
		public void testKeyGestureBackHandled() {
		sendKeyGestureEventComplete(KeyGestureEvent.KEY_GESTURE_TYPE_BACK);
		mPhoneWindowManager.assertBackEventInjected();
		}

		@Test
		public void testKeyGestureMultiWindowNavigation() {
		sendKeyGestureEventComplete(KeyGestureEvent.KEY_GESTURE_TYPE_MULTI_WINDOW_NAVIGATION);