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

Commit 10481f77 authored by Archisha Baranwal's avatar Archisha Baranwal
Browse files

Modified Revert of "Adding ViewCaptureAwareWindowManager to AssistDisclosure..." 

Revert submission 28833667-assistDisclosureViewCapture

Reason for revert: Reverting change due to the restructure of ViewCaptureAwareWindowManager ( go/wm-for-viewcapture )

Reverted changes: /q/submissionid:28833667-assistDisclosureViewCapture

Flag: com.android.systemui.enable_view_capture_tracing

Change-Id: Idadbd295463080508e57bc926053d5330d1723f3
parent 205763b1

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

+3 −5
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 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;



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

public class AssistDisclosure {

    private final Context mContext;

    private final ViewCaptureAwareWindowManager mWm;

    private final WindowManager mWm;

    private final Handler mHandler;



    private AssistDisclosureView mView;

    private boolean mViewAdded;



    public AssistDisclosure(Context context, Handler handler,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager) {

    public AssistDisclosure(Context context, Handler handler, WindowManager windowManager) {

        mContext = context;

        mHandler = handler;

        mWm = viewCaptureAwareWindowManager;

        mWm = windowManager;

    }



    public void postShow() {

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

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.provider.Settings; 
import android.service.voice.VisualQueryAttentionResult;

import android.service.voice.VoiceInteractionSession;

import android.util.Log;

import android.view.WindowManager;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.internal.app.AssistUtils;

import com.android.internal.app.IVisualQueryDetectionAttentionListener;

import com.android.internal.app.IVisualQueryRecognitionStatusListener;
@@ -199,12 +199,12 @@ public class AssistManager { 
            SelectedUserInteractor selectedUserInteractor,

            ActivityManager activityManager,

            AssistInteractor interactor,

            ViewCaptureAwareWindowManager viewCaptureAwareWindowManager) {

            WindowManager windowManager) {

        mContext = context;

        mDeviceProvisionedController = controller;

        mCommandQueue = commandQueue;

        mAssistUtils = assistUtils;

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

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

        mLauncherProxyService = launcherProxyService;

        mPhoneStateMonitor = phoneStateMonitor;

        mAssistLogger = assistLogger;