Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide assist handles during generic assist gesture invocation." into qt-dev

Browse Source
This commit is contained in:
Matt Casey
2019-05-30 19:38:38 +00:00
committed by Android (Google) Code Review
parent 5a0b7e59c4 558100d727
commit c71c7fe881
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);