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

Commit 841f68cb authored by archisha's avatar archisha Committed by Archisha Baranwal
Browse files

Adding ViewCaptureAwareWindowManager to MirrorControlWindow. 

Bug: 361019202
Flag: com.android.systemui.enable_view_capture_tracing
Test: MirrowWindowControlTest

Change-Id: If8ecc6755a202d39f72287ecbf1630d31a7f6163
parent f08b3a43

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MirrorWindowControlTest.java

+2 −2
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ import android.graphics.Point; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.systemui.SysuiTestCase;



import org.junit.Before;
@@ -48,7 +48,7 @@ import org.mockito.MockitoAnnotations; 
@RunWith(AndroidJUnit4.class)

public class MirrorWindowControlTest extends SysuiTestCase {



    @Mock WindowManager mWindowManager;

    @Mock ViewCaptureAwareWindowManager mWindowManager;

    View mView;

    int mViewWidth;

    int mViewHeight;

packages/SystemUI/src/com/android/systemui/accessibility/MirrorWindowControl.java

+7 −3
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ package com.android.systemui.accessibility; 


import static android.view.WindowManager.LayoutParams;



import static com.android.app.viewcapture.ViewCaptureFactory.getViewCaptureAwareWindowManagerInstance;

import static com.android.systemui.Flags.enableViewCaptureTracing;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;
@@ -29,8 +32,8 @@ import android.util.MathUtils; 
import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.View;

import android.view.WindowManager;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.systemui.res.R;



/**
@@ -70,11 +73,12 @@ public abstract class MirrorWindowControl { 
     * @see #setDefaultPosition(LayoutParams)

     */

    private final Point mControlPosition = new Point();

    private final WindowManager mWindowManager;

    private final ViewCaptureAwareWindowManager mWindowManager;



    MirrorWindowControl(Context context) {

        mContext = context;

        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);

        mWindowManager = getViewCaptureAwareWindowManagerInstance(mContext,

                enableViewCaptureTracing());

    }



    public void setWindowDelegate(@Nullable MirrorWindowDelegate windowDelegate) {