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

Commit 5de27b40 authored by Archisha Baranwal's avatar Archisha Baranwal Committed by Android (Google) Code Review
Browse files

Merge "Adding ViewCaptureAwareWindowManager to AssistDisclosure window." into main

parents bb3194ff e1748998

packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java

+5 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.view.WindowManager; 
import android.view.accessibility.AccessibilityEvent;



import com.android.app.animation.Interpolators;

import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.systemui.res.R;



/**
@@ -40,16 +41,17 @@ import com.android.systemui.res.R; 
 */

public class AssistDisclosure {

    private final Context mContext;

    private final WindowManager mWm;

    private final ViewCaptureAwareWindowManager mWm;

    private final Handler mHandler;



    private AssistDisclosureView mView;

    private boolean mViewAdded;



    public AssistDisclosure(Context context, Handler handler) {

    public AssistDisclosure(Context context, Handler handler,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager) {

        mContext = context;

        mHandler = handler;

        mWm = mContext.getSystemService(WindowManager.class);

        mWm = viewCaptureAwareWindowManager;

    }



    public void postShow() {

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+4 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.service.voice.VisualQueryAttentionResult; 
import android.service.voice.VoiceInteractionSession;

import android.util.Log;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.app.AssistUtils;

import com.android.internal.app.IVisualQueryDetectionAttentionListener;

import com.android.internal.app.IVisualQueryRecognitionStatusListener;
@@ -195,12 +196,13 @@ public class AssistManager { 
            SecureSettings secureSettings,

            SelectedUserInteractor selectedUserInteractor,

            ActivityManager activityManager,

            AssistInteractor interactor) {

            AssistInteractor interactor,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager) {

        mContext = context;

        mDeviceProvisionedController = controller;

        mCommandQueue = commandQueue;

        mAssistUtils = assistUtils;

        mAssistDisclosure = new AssistDisclosure(context, uiHandler);

        mAssistDisclosure = new AssistDisclosure(context, uiHandler, viewCaptureAwareWindowManager);

        mOverviewProxyService = overviewProxyService;

        mPhoneStateMonitor = phoneStateMonitor;

        mAssistLogger = assistLogger;