Merge "Add onAssistantGestureCompletion to SystemUiProxy" into qt-dev (7dfdf3d0) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,12 @@ interface ISystemUiProxy {
		*/
		void onAssistantProgress(float progress) = 12;

		/**
		* Proxies the assistant gesture fling velocity (in pixels per millisecond) upon completion.
		* Velocity is 0 for drag gestures.
		*/
		void onAssistantGestureCompletion(float velocity) = 18;

		/**
		* Start the assistant.
		*/

+8 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,14 @@ public class AssistManager implements ConfigurationChangedReceiver {
		// intentional no-op, vendor's AssistManager implementation should override if needed.
		}

		/** Called when the user has invoked the assistant with the incoming velocity, in pixels per
		* millisecond. For invocations without a velocity (e.g. slow drag), the velocity is set to
		* zero.
		*/
		public void onAssistantGestureCompletion(float velocity) {
		// intentional no-op, vendor's AssistManager implementation should override if needed.
		}

		public void hideAssist() {
		mAssistUtils.hideCurrentSession();
		}

+20 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,19 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		}
		}

		@Override
		public void onAssistantGestureCompletion(float velocity) {
		if (!verifyCaller("onAssistantGestureCompletion")) {
		return;
		}
		long token = Binder.clearCallingIdentity();
		try {
		mHandler.post(() -> notifyAssistantGestureCompletion(velocity));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		@Override
		public void startAssistant(Bundle bundle) {
		if (!verifyCaller("startAssistant")) {
		@@ -684,6 +697,12 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		}
		}

		private void notifyAssistantGestureCompletion(float velocity) {
		for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) {
		mConnectionCallbacks.get(i).onAssistantGestureCompletion(velocity);
		}
		}

		private void notifyStartAssistant(Bundle bundle) {
		for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) {
		mConnectionCallbacks.get(i).startAssistant(bundle);
		@@ -732,6 +751,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		default void onQuickScrubStarted() {}
		default void onBackButtonAlphaChanged(float alpha, boolean animate) {}
		default void onAssistantProgress(@FloatRange(from = 0.0, to = 1.0) float progress) {}
		default void onAssistantGestureCompletion(float velocity) {}
		default void startAssistant(Bundle bundle) {}
		}
		}