Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 558100d7 authored by Matt Casey's avatar Matt Casey
Browse files

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
parent 37efc112

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

+10 −1
Original line number 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.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);