Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am: c71c7fe881 (840d2a97) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,8 @@ import com.android.internal.logging.MetricsLogger;
	import com.android.internal.logging.nano.MetricsProto.MetricsEvent;		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
	import com.android.systemui.Dependency;		import com.android.systemui.Dependency;
	import com.android.systemui.R;		import com.android.systemui.R;
			import com.android.systemui.ScreenDecorations;
			import com.android.systemui.SysUiServiceProvider;
	import com.android.systemui.assist.AssistManager;		import com.android.systemui.assist.AssistManager;

	/**		/**
	@@ -92,12 +94,12 @@ public class DefaultUiController implements AssistManager.UiController {
	if (progress == 1) {		if (progress == 1) {
	animateInvocationCompletion(type, 0);		animateInvocationCompletion(type, 0);
	} else if (progress == 0) {		} else if (progress == 0) {
	mInvocationInProgress = false;
	hide();		hide();
	} else {		} else {
	if (!mInvocationInProgress) {		if (!mInvocationInProgress) {
	attach();		attach();
	mInvocationInProgress = true;		mInvocationInProgress = true;
			updateAssistHandleVisibility();
	}		}
	setProgressInternal(type, progress);		setProgressInternal(type, progress);
	}		}
	@@ -129,6 +131,7 @@ public class DefaultUiController implements AssistManager.UiController {
	}		}
	mInvocationLightsView.hide();		mInvocationLightsView.hide();
	mInvocationInProgress = false;		mInvocationInProgress = false;
			updateAssistHandleVisibility();
	}		}

	/**		/**
	@@ -139,6 +142,12 @@ public class DefaultUiController implements AssistManager.UiController {
	mInvocationLightsView.setColors(color1, color2, color3, color4);		mInvocationLightsView.setColors(color1, color2, color3, color4);
	}		}

			private void updateAssistHandleVisibility() {
			ScreenDecorations decorations = SysUiServiceProvider.getComponent(mRoot.getContext(),
			ScreenDecorations.class);
			decorations.setAssistHintBlocked(mInvocationInProgress);
			}

	private void attach() {		private void attach() {
	if (!mAttached) {		if (!mAttached) {
	mWindowManager.addView(mRoot, mLayoutParams);		mWindowManager.addView(mRoot, mLayoutParams);