From 558100d7279a35a34e4ef82f7ee5a78b02bf6a96 Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Thu, 30 May 2019 12:22:06 -0400
Subject: [PATCH] Hide assist handles during generic assist gesture invocation.

Currently we hide handles during an NGA session, this change also hides
them during non-NGA invocation gesture.

Bug: 133522787
Test: Manual testing
Change-Id: I3317b309cd07c032826e6bfccbf20433de0559c6
---
 .../systemui/assist/ui/DefaultUiController.java       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java
index 7ad6dfd2672b8..b1be811be9cf8 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java
@@ -35,6 +35,8 @@ import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.systemui.Dependency;
 import com.android.systemui.R;
+import com.android.systemui.ScreenDecorations;
+import com.android.systemui.SysUiServiceProvider;
 import com.android.systemui.assist.AssistManager;
 
 /**
@@ -92,12 +94,12 @@ public class DefaultUiController implements AssistManager.UiController {
         if (progress == 1) {
             animateInvocationCompletion(type, 0);
         } else if (progress == 0) {
-            mInvocationInProgress = false;
             hide();
         } else {
             if (!mInvocationInProgress) {
                 attach();
                 mInvocationInProgress = true;
+                updateAssistHandleVisibility();
             }
             setProgressInternal(type, progress);
         }
@@ -129,6 +131,7 @@ public class DefaultUiController implements AssistManager.UiController {
         }
         mInvocationLightsView.hide();
         mInvocationInProgress = false;
+        updateAssistHandleVisibility();
     }
 
     /**
@@ -139,6 +142,12 @@ public class DefaultUiController implements AssistManager.UiController {
         mInvocationLightsView.setColors(color1, color2, color3, color4);
     }
 
+    private void updateAssistHandleVisibility() {
+        ScreenDecorations decorations = SysUiServiceProvider.getComponent(mRoot.getContext(),
+                ScreenDecorations.class);
+        decorations.setAssistHintBlocked(mInvocationInProgress);
+    }
+
     private void attach() {
         if (!mAttached) {
             mWindowManager.addView(mRoot, mLayoutParams);